* PChar -> PAnsiChar

packages/winunits-jedi/src/ModuleLoader.pas

@@ -1,4 +1,4 @@
-{******************************************************************}
+****************************************************************}
 {                                                                  }
 {       Project JEDI                                               }
 {       OS independent Dynamic Loading Helpers                     }
@@ -74,17 +74,17 @@ const
 
 
 {$IFNDEF JWA_INCLUDEMODE}
-function LoadModule(var Module: TModuleHandle; FileName: string): Boolean;
+function LoadModule(var Module: TModuleHandle; FileName: Ansistring): Boolean;
 {$ELSE}
-function ModuleLoader_LoadModule(var Module: TModuleHandle; FileName: string): Boolean;
+function ModuleLoader_LoadModule(var Module: TModuleHandle; FileName: Ansistring): Boolean;
 {$ENDIF JWA_INCLUDEMODE}
 
-function LoadModuleEx(var Module: TModuleHandle; FileName: string; Flags: Cardinal): Boolean;
+function LoadModuleEx(var Module: TModuleHandle; FileName: Ansistring; Flags: Cardinal): Boolean;
 procedure UnloadModule(var Module: TModuleHandle);
-function GetModuleSymbol(Module: TModuleHandle; SymbolName: string): Pointer;
-function GetModuleSymbolEx(Module: TModuleHandle; SymbolName: string; var Accu: Boolean): Pointer;
-function ReadModuleData(Module: TModuleHandle; SymbolName: string; var Buffer; Size: Cardinal): Boolean;
-function WriteModuleData(Module: TModuleHandle; SymbolName: string; var Buffer; Size: Cardinal): Boolean;
+function GetModuleSymbol(Module: TModuleHandle; SymbolName: Ansistring): Pointer;
+function GetModuleSymbolEx(Module: TModuleHandle; SymbolName: Ansistring; var Accu: Boolean): Pointer;
+function ReadModuleData(Module: TModuleHandle; SymbolName: Ansistring; var Buffer; Size: Cardinal): Boolean;
+function WriteModuleData(Module: TModuleHandle; SymbolName: Ansistring; var Buffer; Size: Cardinal): Boolean;
 
 // (p3)
 // Simple DLL loading class. The idea is to use it to dynamically load
@@ -106,7 +106,7 @@ type
   TModuleLoader = class(TObject)
   private
     FHandle: TModuleHandle;
-    FDLLName: string;
+    FDLLName: ansistring;
     function GetLoaded: Boolean;
   protected
     procedure Load(LoadMethods: TModuleLoadMethods); virtual;
@@ -115,22 +115,22 @@ type
   public
     // Check whether a DLL (and optionally a function) is available on the system
     // To only check the DLL, leave ProcName empty
-    class function IsAvaliable(const ADLLName: string; const AProcName: string = ''): Boolean;
-    constructor Create(const ADLLName: string; LoadMethods: TModuleLoadMethods = []);
+    class function IsAvaliable(const ADLLName: ansistring; const AProcName: AnsiString = ''): Boolean;
+    constructor Create(const ADLLName: ansistring; LoadMethods: TModuleLoadMethods = []);
     destructor Destroy; override;
     // Get a pointer to a function in the DLL. Should be called as GetProcedure('Name',@FuncPointer);
     // Returns True if the function was found. Note that a call to GetProcAddress is only executed if AProc = nil
-    function GetProcedure(const AName: string; var AProc: Pointer): Boolean;
+    function GetProcedure(const AName: ansistring; var AProc: Pointer): Boolean;
     // Returns a symbol exported from the DLL and puts it in Buffer.
     // Make sure AName is actually a symbol and not a function or this will crash horribly!
-    function GetExportedSymbol(const AName: string; var Buffer; Size: Integer): Boolean;
+    function GetExportedSymbol(const AName: ansistring; var Buffer; Size: Integer): Boolean;
     // Changes a symbol exported from the DLL into the value in Buffer.
     // The change is not persistent (it will get lost when the DLL is unloaded)
     // Make sure AName is actually a symbol and not a function or this will crash horribly!
-    function SetExportedSymbol(const AName: string; var Buffer; Size: Integer): Boolean;
+    function SetExportedSymbol(const AName: ansistring; var Buffer; Size: Integer): Boolean;
 
     property Loaded: Boolean read GetLoaded;
-    property DLLName: string read FDLLName;
+    property DLLName: ansistring read FDLLName;
     property Handle: TModuleHandle read FHandle;
   end;
 
@@ -157,13 +157,13 @@ implementation
 // on entry the function will do nothing but returning success.
 
 {$IFNDEF JWA_INCLUDEMODE}
-function LoadModule(var Module: TModuleHandle; FileName: string): Boolean;
+function LoadModule(var Module: TModuleHandle; FileName: AnsiString): Boolean;
 {$ELSE}
-function ModuleLoader_LoadModule(var Module: TModuleHandle; FileName: string): Boolean;
+function ModuleLoader_LoadModule(var Module: TModuleHandle; FileName: AnsiString): Boolean;
 {$ENDIF JWA_INCLUDEMODE}
 begin
   if Module = INVALID_MODULEHANDLE_VALUE then
-    Module := LoadLibraryA(PChar(FileName));
+    Module := LoadLibraryA(PAnsiChar(FileName));
   Result := Module <> INVALID_MODULEHANDLE_VALUE;
 end;
 
@@ -171,10 +171,10 @@ end;
 // LoadLibraryEx is used to get better control of the loading
 // for the allowed values for flags see LoadLibraryEx documentation.
 
-function LoadModuleEx(var Module: TModuleHandle; FileName: string; Flags: Cardinal): Boolean;
+function LoadModuleEx(var Module: TModuleHandle; FileName: AnsiString; Flags: Cardinal): Boolean;
 begin
   if Module = INVALID_MODULEHANDLE_VALUE then
-    Module := LoadLibraryExA(PChar(FileName), 0, Flags);
+    Module := LoadLibraryExA(PAnsiChar(FileName), 0, Flags);
   Result := Module <> INVALID_MODULEHANDLE_VALUE;
 end;
 
@@ -194,11 +194,11 @@ end;
 // if it is exported from the DLL Module
 // nil is returned if the symbol is not available
 
-function GetModuleSymbol(Module: TModuleHandle; SymbolName: string): Pointer;
+function GetModuleSymbol(Module: TModuleHandle; SymbolName: AnsiString): Pointer;
 begin
   Result := nil;
   if Module <> INVALID_MODULEHANDLE_VALUE then
-    Result := GetProcAddress(Module, PChar(SymbolName));
+    Result := GetProcAddress(Module, PAnsiChar(SymbolName));
 end;
 
 // returns the pointer to the symbol named SymbolName
@@ -209,11 +209,11 @@ end;
 // This is very handy for rendering a global result
 // when accessing a long list of symbols.
 
-function GetModuleSymbolEx(Module: TModuleHandle; SymbolName: string; var Accu: Boolean): Pointer;
+function GetModuleSymbolEx(Module: TModuleHandle; SymbolName: AnsiString; var Accu: Boolean): Pointer;
 begin
   Result := nil;
   if Module <> INVALID_MODULEHANDLE_VALUE then
-    Result := GetProcAddress(Module, PChar(SymbolName));
+    Result := GetProcAddress(Module, PAnsiChar(SymbolName));
   Accu := Accu and (Result <> nil);
 end;
 
@@ -224,7 +224,7 @@ end;
 // Be sure to access a variable not a function and be sure
 // to read the correct amount of data.
 
-function ReadModuleData(Module: TModuleHandle; SymbolName: string; var Buffer; Size: Cardinal): Boolean;
+function ReadModuleData(Module: TModuleHandle; SymbolName: AnsiString; var Buffer; Size: Cardinal): Boolean;
 var
   Sym: Pointer;
 begin
@@ -243,7 +243,7 @@ end;
 // The changes are not persistent. They get lost when the
 // DLL is unloaded.
 
-function WriteModuleData(Module: TModuleHandle; SymbolName: string; var Buffer; Size: Cardinal): Boolean;
+function WriteModuleData(Module: TModuleHandle; SymbolName: AnsiString; var Buffer; Size: Cardinal): Boolean;
 var
   Sym: Pointer;
 begin
@@ -268,13 +268,13 @@ const
 // on entry the function will do nothing but returning success.
 
 {$IFNDEF JWA_INCLUDEMODE}
-function LoadModule(var Module: TModuleHandle; FileName: string): Boolean;
+function LoadModule(var Module: TModuleHandle; FileName: AnsiString): Boolean;
 {$ELSE}
-function ModuleLoader_LoadModule(var Module: TModuleHandle; FileName: string): Boolean;
+function ModuleLoader_LoadModule(var Module: TModuleHandle; FileName: AnsiString): Boolean;
 {$ENDIF JWA_INCLUDEMODE}
 begin
   if Module = INVALID_MODULEHANDLE_VALUE then
-    Module := dlopen(PChar(FileName), RTLD_NOW);
+    Module := dlopen(PAnsiChar(FileName), RTLD_NOW);
   Result := Module <> INVALID_MODULEHANDLE_VALUE;
 end;
 
@@ -282,10 +282,10 @@ end;
 // dlopen() with flags is used to get better control of the loading
 // for the allowed values for flags see "man dlopen".
 
-function LoadModuleEx(var Module: TModuleHandle; FileName: string; Flags: Cardinal): Boolean;
+function LoadModuleEx(var Module: TModuleHandle; FileName: AnsiString; Flags: Cardinal): Boolean;
 begin
   if Module = INVALID_MODULEHANDLE_VALUE then
-    Module := dlopen(PChar(FileName), Flags);
+    Module := dlopen(PAnsiChar(FileName), Flags);
   Result := Module <> INVALID_MODULEHANDLE_VALUE;
 end;
 
@@ -305,11 +305,11 @@ end;
 // if it is exported from the .so Module
 // nil is returned if the symbol is not available
 
-function GetModuleSymbol(Module: TModuleHandle; SymbolName: string): Pointer;
+function GetModuleSymbol(Module: TModuleHandle; SymbolName: AnsiString): Pointer;
 begin
   Result := nil;
   if Module <> INVALID_MODULEHANDLE_VALUE then
-    Result := dlsym(Module, PChar(SymbolName));
+    Result := dlsym(Module, PAnsiChar(SymbolName));
 end;
 
 // returns the pointer to the symbol named SymbolName
@@ -320,11 +320,11 @@ end;
 // This is very handy for rendering a global result
 // when accessing a long list of symbols.
 
-function GetModuleSymbolEx(Module: TModuleHandle; SymbolName: string; var Accu: Boolean): Pointer;
+function GetModuleSymbolEx(Module: TModuleHandle; SymbolName: AnsiString; var Accu: Boolean): Pointer;
 begin
   Result := nil;
   if Module <> INVALID_MODULEHANDLE_VALUE then
-    Result := dlsym(Module, PChar(SymbolName));
+    Result := dlsym(Module, PAnsiChar(SymbolName));
   Accu := Accu and (Result <> nil);
 end;
 
@@ -335,7 +335,7 @@ end;
 // Be sure to access a variable not a function and be sure
 // to read the correct amount of data.
 
-function ReadModuleData(Module: TModuleHandle; SymbolName: string; var Buffer; Size: Cardinal): Boolean;
+function ReadModuleData(Module: TModuleHandle; SymbolName: AnsiString; var Buffer; Size: Cardinal): Boolean;
 var
   Sym: Pointer;
 begin
@@ -354,7 +354,7 @@ end;
 // The changes are not persistent. They get lost when the
 // .so is unloaded.
 
-function WriteModuleData(Module: TModuleHandle; SymbolName: string; var Buffer; Size: Cardinal): Boolean;
+function WriteModuleData(Module: TModuleHandle; SymbolName: AnsiString; var Buffer; Size: Cardinal): Boolean;
 var
   Sym: Pointer;
 begin
@@ -368,7 +368,7 @@ end;
 
 //=== { TModuleLoader } ======================================================
 
-constructor TModuleLoader.Create(const ADLLName: string; LoadMethods: TModuleLoadMethods = []);
+constructor TModuleLoader.Create(const ADLLName: AnsiString; LoadMethods: TModuleLoadMethods = []);
 begin
   inherited Create;
   FHandle := INVALID_MODULEHANDLE_VALUE;
@@ -387,7 +387,7 @@ begin
   // overridden classes should handle this
 end;
 
-function TModuleLoader.GetExportedSymbol(const AName: string; var Buffer;
+function TModuleLoader.GetExportedSymbol(const AName: AnsiString; var Buffer;
   Size: Integer): Boolean;
 var
   ASymbol: Pointer;
@@ -402,7 +402,7 @@ begin
   Result := Handle <> INVALID_MODULEHANDLE_VALUE;
 end;
 
-function TModuleLoader.GetProcedure(const AName: string; var AProc: Pointer): Boolean;
+function TModuleLoader.GetProcedure(const AName: AnsiString; var AProc: Pointer): Boolean;
 begin
   Result := Loaded;
   if Result and not Assigned(AProc) then
@@ -417,7 +417,7 @@ begin
   end;
 end;
 
-class function TModuleLoader.IsAvaliable(const ADLLName: string; const AProcName: string = ''): Boolean;
+class function TModuleLoader.IsAvaliable(const ADLLName: AnsiString; const AProcName: AnsiString = ''): Boolean;
 var
   Module: TModuleHandle;
   P: Pointer;
@@ -462,7 +462,7 @@ begin
     Error(GetLastError);
 end;
 
-function TModuleLoader.SetExportedSymbol(const AName: string; var Buffer;
+function TModuleLoader.SetExportedSymbol(const AName: AnsiString; var Buffer;
   Size: Integer): Boolean;
 var
   ASymbol: Pointer;

packages/winunits-jedi/src/jwaadstlb.pas

@@ -15,7 +15,7 @@ unit JwaAdsTLB;
 // manual modifications will be lost.
 // ************************************************************************ //
 
-// (rom) deactivated CVS string
+// (rom) deactivated CVS AnsiString
 // PASTLWTR : Revision:   1.88.1.0.1.0
 // File generated on 9/25/2000 11:37:09 AM from Type Library described below.
 
@@ -37,7 +37,7 @@ unit JwaAdsTLB;
 //   (1) v2.0 stdole, (C:\WINNT\System32\stdole2.tlb)
 //   (2) v4.0 StdVCL, (C:\WINNT\System32\STDVCL40.DLL)
 // Errors:
-//   Hint: Member 'String' of '_ADS_CASEIGNORE_LIST' changed to 'String_'
+//   Hint: Member 'AnsiString' of '_ADS_CASEIGNORE_LIST' changed to 'String_'
 //   Hint: Member 'Type' of '__MIDL___MIDL_itf_ads_0000_0005' changed to 'Type_'
 //   Hint: Member 'Type' of '__MIDL___MIDL_itf_ads_0000_0014' changed to 'Type_'
 //   Hint: Member 'Class' of 'IADs' changed to 'Class_'
@@ -90,7 +90,7 @@ Type
            TServerData= Record
                             ClassID:   TGUID;
                             IntfIID:   TGUID;
-                            EventIID:  String;   // probably TGUID too
+                            EventIID:  AnsiString;   // probably TGUID too
                             LicenseKey: pointer;
                             Version: integer
                             end;
@@ -4150,13 +4150,13 @@ type
 // *********************************************************************//
   CoPropertyEntry = class
     class function Create: IADsPropertyEntry;
-    class function CreateRemote(const MachineName: string): IADsPropertyEntry;
+    class function CreateRemote(const MachineName: AnsiString): IADsPropertyEntry;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TPropertyEntry
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsPropertyEntry
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4240,13 +4240,13 @@ type
 // *********************************************************************//
   CoPropertyValue = class
     class function Create: IADsPropertyValue;
-    class function CreateRemote(const MachineName: string): IADsPropertyValue;
+    class function CreateRemote(const MachineName: AnsiString): IADsPropertyValue;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TPropertyValue
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsPropertyValue
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4376,13 +4376,13 @@ type
 // *********************************************************************//
   CoAccessControlEntry = class
     class function Create: IADsAccessControlEntry;
-    class function CreateRemote(const MachineName: string): IADsAccessControlEntry;
+    class function CreateRemote(const MachineName: AnsiString): IADsAccessControlEntry;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TAccessControlEntry
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsAccessControlEntry
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4484,13 +4484,13 @@ type
 // *********************************************************************//
   CoAccessControlList = class
     class function Create: IADsAccessControlList;
-    class function CreateRemote(const MachineName: string): IADsAccessControlList;
+    class function CreateRemote(const MachineName: AnsiString): IADsAccessControlList;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TAccessControlList
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsAccessControlList
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4565,13 +4565,13 @@ type
 // *********************************************************************//
   CoSecurityDescriptor = class
     class function Create: IADsSecurityDescriptor;
-    class function CreateRemote(const MachineName: string): IADsSecurityDescriptor;
+    class function CreateRemote(const MachineName: AnsiString): IADsSecurityDescriptor;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TSecurityDescriptor
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsSecurityDescriptor
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4690,13 +4690,13 @@ type
 // *********************************************************************//
   CoLargeInteger = class
     class function Create: IADsLargeInteger;
-    class function CreateRemote(const MachineName: string): IADsLargeInteger;
+    class function CreateRemote(const MachineName: AnsiString): IADsLargeInteger;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : {$IFNDEF JWA_INCLUDEMODE} TLargeInteger {$ELSE} TLargeIntegerX {$ENDIF}
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsLargeInteger
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4768,13 +4768,13 @@ type
 // *********************************************************************//
   CoNameTranslate = class
     class function Create: IADsNameTranslate;
-    class function CreateRemote(const MachineName: string): IADsNameTranslate;
+    class function CreateRemote(const MachineName: AnsiString): IADsNameTranslate;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TNameTranslate
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsNameTranslate
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4845,13 +4845,13 @@ type
 // *********************************************************************//
   CoCaseIgnoreList = class
     class function Create: IADsCaseIgnoreList;
-    class function CreateRemote(const MachineName: string): IADsCaseIgnoreList;
+    class function CreateRemote(const MachineName: AnsiString): IADsCaseIgnoreList;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TCaseIgnoreList
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsCaseIgnoreList
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4916,13 +4916,13 @@ type
 // *********************************************************************//
   CoFaxNumber = class
     class function Create: IADsFaxNumber;
-    class function CreateRemote(const MachineName: string): IADsFaxNumber;
+    class function CreateRemote(const MachineName: AnsiString): IADsFaxNumber;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TFaxNumber
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsFaxNumber
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -4993,13 +4993,13 @@ type
 // *********************************************************************//
   CoNetAddress = class
     class function Create: IADsNetAddress;
-    class function CreateRemote(const MachineName: string): IADsNetAddress;
+    class function CreateRemote(const MachineName: AnsiString): IADsNetAddress;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TNetAddress
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsNetAddress
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5070,13 +5070,13 @@ type
 // *********************************************************************//
   CoOctetList = class
     class function Create: IADsOctetList;
-    class function CreateRemote(const MachineName: string): IADsOctetList;
+    class function CreateRemote(const MachineName: AnsiString): IADsOctetList;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TOctetList
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsOctetList
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5141,13 +5141,13 @@ type
 // *********************************************************************//
   CoEmail = class
     class function Create: IADsEmail;
-    class function CreateRemote(const MachineName: string): IADsEmail;
+    class function CreateRemote(const MachineName: AnsiString): IADsEmail;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TEmail
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsEmail
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5219,13 +5219,13 @@ type
 // *********************************************************************//
   CoPath = class
     class function Create: IADsPath;
-    class function CreateRemote(const MachineName: string): IADsPath;
+    class function CreateRemote(const MachineName: AnsiString): IADsPath;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TPath
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsPath
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5303,13 +5303,13 @@ type
 // *********************************************************************//
   CoReplicaPointer = class
     class function Create: IADsReplicaPointer;
-    class function CreateRemote(const MachineName: string): IADsReplicaPointer;
+    class function CreateRemote(const MachineName: AnsiString): IADsReplicaPointer;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TReplicaPointer
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsReplicaPointer
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5398,13 +5398,13 @@ type
 // *********************************************************************//
   CoAcl = class
     class function Create: IADsAcl;
-    class function CreateRemote(const MachineName: string): IADsAcl;
+    class function CreateRemote(const MachineName: AnsiString): IADsAcl;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : {$IFNDEF JWA_INCLUDEMODE} TAcl {$ELSE} TAclX {$ENDIF}
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsAcl
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5483,13 +5483,13 @@ type
 // *********************************************************************//
   CoTimestamp = class
     class function Create: IADsTimestamp;
-    class function CreateRemote(const MachineName: string): IADsTimestamp;
+    class function CreateRemote(const MachineName: AnsiString): IADsTimestamp;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TTimestamp
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsTimestamp
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5561,13 +5561,13 @@ type
 // *********************************************************************//
   CoPostalAddress = class
     class function Create: IADsPostalAddress;
-    class function CreateRemote(const MachineName: string): IADsPostalAddress;
+    class function CreateRemote(const MachineName: AnsiString): IADsPostalAddress;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TPostalAddress
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsPostalAddress
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5632,13 +5632,13 @@ type
 // *********************************************************************//
   CoBackLink = class
     class function Create: IADsBackLink;
-    class function CreateRemote(const MachineName: string): IADsBackLink;
+    class function CreateRemote(const MachineName: AnsiString): IADsBackLink;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TBackLink
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsBackLink
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5710,13 +5710,13 @@ type
 // *********************************************************************//
   CoTypedName = class
     class function Create: IADsTypedName;
-    class function CreateRemote(const MachineName: string): IADsTypedName;
+    class function CreateRemote(const MachineName: AnsiString): IADsTypedName;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TTypedName
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsTypedName
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5794,13 +5794,13 @@ type
 // *********************************************************************//
   CoHold = class
     class function Create: IADsHold;
-    class function CreateRemote(const MachineName: string): IADsHold;
+    class function CreateRemote(const MachineName: AnsiString): IADsHold;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : THold
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsHold
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5872,13 +5872,13 @@ type
 // *********************************************************************//
   CoPathname = class
     class function Create: IADsPathname;
-    class function CreateRemote(const MachineName: string): IADsPathname;
+    class function CreateRemote(const MachineName: AnsiString): IADsPathname;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TPathname
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsPathname
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -5953,13 +5953,13 @@ type
 // *********************************************************************//
   CoADSystemInfo = class
     class function Create: IADsADSystemInfo;
-    class function CreateRemote(const MachineName: string): IADsADSystemInfo;
+    class function CreateRemote(const MachineName: AnsiString): IADsADSystemInfo;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TADSystemInfo
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsADSystemInfo
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -6050,13 +6050,13 @@ type
 // *********************************************************************//
   CoWinNTSystemInfo = class
     class function Create: IADsWinNTSystemInfo;
-    class function CreateRemote(const MachineName: string): IADsWinNTSystemInfo;
+    class function CreateRemote(const MachineName: AnsiString): IADsWinNTSystemInfo;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TWinNTSystemInfo
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsWinNTSystemInfo
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -6128,13 +6128,13 @@ type
 // *********************************************************************//
   CoDNWithBinary = class
     class function Create: IADsDNWithBinary;
-    class function CreateRemote(const MachineName: string): IADsDNWithBinary;
+    class function CreateRemote(const MachineName: AnsiString): IADsDNWithBinary;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TDNWithBinary
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsDNWithBinary
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -6205,13 +6205,13 @@ type
 // *********************************************************************//
   CoDNWithString = class
     class function Create: IADsDNWithString;
-    class function CreateRemote(const MachineName: string): IADsDNWithString;
+    class function CreateRemote(const MachineName: AnsiString): IADsDNWithString;
   end;
 
 // *********************************************************************//
 // OLE Server Proxy class declaration
 // Server Object    : TDNWithString
-// Help String      :
+// Help AnsiString      :
 // Default Interface: IADsDNWithString
 // Def. Intf. DISP? : No
 // Event   Interface:
@@ -6292,7 +6292,7 @@ begin
   Result := CreateComObject(CLASS_PropertyEntry) as IADsPropertyEntry;
 end;
 
-class function CoPropertyEntry.CreateRemote(const MachineName: string): IADsPropertyEntry;
+class function CoPropertyEntry.CreateRemote(const MachineName: AnsiString): IADsPropertyEntry;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_PropertyEntry) as IADsPropertyEntry;
 end;
@@ -6469,7 +6469,7 @@ begin
   Result := CreateComObject(CLASS_PropertyValue) as IADsPropertyValue;
 end;
 
-class function CoPropertyValue.CreateRemote(const MachineName: string): IADsPropertyValue;
+class function CoPropertyValue.CreateRemote(const MachineName: AnsiString): IADsPropertyValue;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_PropertyValue) as IADsPropertyValue;
 end;
@@ -6806,7 +6806,7 @@ begin
   Result := CreateComObject(CLASS_AccessControlEntry) as IADsAccessControlEntry;
 end;
 
-class function CoAccessControlEntry.CreateRemote(const MachineName: string): IADsAccessControlEntry;
+class function CoAccessControlEntry.CreateRemote(const MachineName: AnsiString): IADsAccessControlEntry;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_AccessControlEntry) as IADsAccessControlEntry;
 end;
@@ -7038,7 +7038,7 @@ begin
   Result := CreateComObject(CLASS_AccessControlList) as IADsAccessControlList;
 end;
 
-class function CoAccessControlList.CreateRemote(const MachineName: string): IADsAccessControlList;
+class function CoAccessControlList.CreateRemote(const MachineName: AnsiString): IADsAccessControlList;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_AccessControlList) as IADsAccessControlList;
 end;
@@ -7185,7 +7185,7 @@ begin
   Result := CreateComObject(CLASS_SecurityDescriptor) as IADsSecurityDescriptor;
 end;
 
-class function CoSecurityDescriptor.CreateRemote(const MachineName: string): IADsSecurityDescriptor;
+class function CoSecurityDescriptor.CreateRemote(const MachineName: AnsiString): IADsSecurityDescriptor;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_SecurityDescriptor) as IADsSecurityDescriptor;
 end;
@@ -7482,7 +7482,7 @@ begin
   Result := CreateComObject(CLASS_LargeInteger) as IADsLargeInteger;
 end;
 
-class function CoLargeInteger.CreateRemote(const MachineName: string): IADsLargeInteger;
+class function CoLargeInteger.CreateRemote(const MachineName: AnsiString): IADsLargeInteger;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_LargeInteger) as IADsLargeInteger;
 end;
@@ -7614,7 +7614,7 @@ begin
   Result := CreateComObject(CLASS_NameTranslate) as IADsNameTranslate;
 end;
 
-class function CoNameTranslate.CreateRemote(const MachineName: string): IADsNameTranslate;
+class function CoNameTranslate.CreateRemote(const MachineName: AnsiString): IADsNameTranslate;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_NameTranslate) as IADsNameTranslate;
 end;
@@ -7748,7 +7748,7 @@ begin
   Result := CreateComObject(CLASS_CaseIgnoreList) as IADsCaseIgnoreList;
 end;
 
-class function CoCaseIgnoreList.CreateRemote(const MachineName: string): IADsCaseIgnoreList;
+class function CoCaseIgnoreList.CreateRemote(const MachineName: AnsiString): IADsCaseIgnoreList;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_CaseIgnoreList) as IADsCaseIgnoreList;
 end;
@@ -7860,7 +7860,7 @@ begin
   Result := CreateComObject(CLASS_FaxNumber) as IADsFaxNumber;
 end;
 
-class function CoFaxNumber.CreateRemote(const MachineName: string): IADsFaxNumber;
+class function CoFaxNumber.CreateRemote(const MachineName: AnsiString): IADsFaxNumber;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_FaxNumber) as IADsFaxNumber;
 end;
@@ -7992,7 +7992,7 @@ begin
   Result := CreateComObject(CLASS_NetAddress) as IADsNetAddress;
 end;
 
-class function CoNetAddress.CreateRemote(const MachineName: string): IADsNetAddress;
+class function CoNetAddress.CreateRemote(const MachineName: AnsiString): IADsNetAddress;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_NetAddress) as IADsNetAddress;
 end;
@@ -8124,7 +8124,7 @@ begin
   Result := CreateComObject(CLASS_OctetList) as IADsOctetList;
 end;
 
-class function CoOctetList.CreateRemote(const MachineName: string): IADsOctetList;
+class function CoOctetList.CreateRemote(const MachineName: AnsiString): IADsOctetList;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_OctetList) as IADsOctetList;
 end;
@@ -8236,7 +8236,7 @@ begin
   Result := CreateComObject(CLASS_Email) as IADsEmail;
 end;
 
-class function CoEmail.CreateRemote(const MachineName: string): IADsEmail;
+class function CoEmail.CreateRemote(const MachineName: AnsiString): IADsEmail;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_Email) as IADsEmail;
 end;
@@ -8368,7 +8368,7 @@ begin
   Result := CreateComObject(CLASS_Path) as IADsPath;
 end;
 
-class function CoPath.CreateRemote(const MachineName: string): IADsPath;
+class function CoPath.CreateRemote(const MachineName: AnsiString): IADsPath;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_Path) as IADsPath;
 end;
@@ -8520,7 +8520,7 @@ begin
   Result := CreateComObject(CLASS_ReplicaPointer) as IADsReplicaPointer;
 end;
 
-class function CoReplicaPointer.CreateRemote(const MachineName: string): IADsReplicaPointer;
+class function CoReplicaPointer.CreateRemote(const MachineName: AnsiString): IADsReplicaPointer;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_ReplicaPointer) as IADsReplicaPointer;
 end;
@@ -8712,7 +8712,7 @@ begin
   Result := CreateComObject(CLASS_Acl) as IADsAcl;
 end;
 
-class function CoAcl.CreateRemote(const MachineName: string): IADsAcl;
+class function CoAcl.CreateRemote(const MachineName: AnsiString): IADsAcl;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_Acl) as IADsAcl;
 end;
@@ -8869,7 +8869,7 @@ begin
   Result := CreateComObject(CLASS_Timestamp) as IADsTimestamp;
 end;
 
-class function CoTimestamp.CreateRemote(const MachineName: string): IADsTimestamp;
+class function CoTimestamp.CreateRemote(const MachineName: AnsiString): IADsTimestamp;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_Timestamp) as IADsTimestamp;
 end;
@@ -9001,7 +9001,7 @@ begin
   Result := CreateComObject(CLASS_PostalAddress) as IADsPostalAddress;
 end;
 
-class function CoPostalAddress.CreateRemote(const MachineName: string): IADsPostalAddress;
+class function CoPostalAddress.CreateRemote(const MachineName: AnsiString): IADsPostalAddress;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_PostalAddress) as IADsPostalAddress;
 end;
@@ -9113,7 +9113,7 @@ begin
   Result := CreateComObject(CLASS_BackLink) as IADsBackLink;
 end;
 
-class function CoBackLink.CreateRemote(const MachineName: string): IADsBackLink;
+class function CoBackLink.CreateRemote(const MachineName: AnsiString): IADsBackLink;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_BackLink) as IADsBackLink;
 end;
@@ -9245,7 +9245,7 @@ begin
   Result := CreateComObject(CLASS_TypedName) as IADsTypedName;
 end;
 
-class function CoTypedName.CreateRemote(const MachineName: string): IADsTypedName;
+class function CoTypedName.CreateRemote(const MachineName: AnsiString): IADsTypedName;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_TypedName) as IADsTypedName;
 end;
@@ -9397,7 +9397,7 @@ begin
   Result := CreateComObject(CLASS_Hold) as IADsHold;
 end;
 
-class function CoHold.CreateRemote(const MachineName: string): IADsHold;
+class function CoHold.CreateRemote(const MachineName: AnsiString): IADsHold;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_Hold) as IADsHold;
 end;
@@ -9529,7 +9529,7 @@ begin
   Result := CreateComObject(CLASS_Pathname) as IADsPathname;
 end;
 
-class function CoPathname.CreateRemote(const MachineName: string): IADsPathname;
+class function CoPathname.CreateRemote(const MachineName: AnsiString): IADsPathname;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_Pathname) as IADsPathname;
 end;
@@ -9686,7 +9686,7 @@ begin
   Result := CreateComObject(CLASS_ADSystemInfo) as IADsADSystemInfo;
 end;
 
-class function CoADSystemInfo.CreateRemote(const MachineName: string): IADsADSystemInfo;
+class function CoADSystemInfo.CreateRemote(const MachineName: AnsiString): IADsADSystemInfo;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_ADSystemInfo) as IADsADSystemInfo;
 end;
@@ -9888,7 +9888,7 @@ begin
   Result := CreateComObject(CLASS_WinNTSystemInfo) as IADsWinNTSystemInfo;
 end;
 
-class function CoWinNTSystemInfo.CreateRemote(const MachineName: string): IADsWinNTSystemInfo;
+class function CoWinNTSystemInfo.CreateRemote(const MachineName: AnsiString): IADsWinNTSystemInfo;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_WinNTSystemInfo) as IADsWinNTSystemInfo;
 end;
@@ -10020,7 +10020,7 @@ begin
   Result := CreateComObject(CLASS_DNWithBinary) as IADsDNWithBinary;
 end;
 
-class function CoDNWithBinary.CreateRemote(const MachineName: string): IADsDNWithBinary;
+class function CoDNWithBinary.CreateRemote(const MachineName: AnsiString): IADsDNWithBinary;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_DNWithBinary) as IADsDNWithBinary;
 end;
@@ -10152,7 +10152,7 @@ begin
   Result := CreateComObject(CLASS_DNWithString) as IADsDNWithString;
 end;
 
-class function CoDNWithString.CreateRemote(const MachineName: string): IADsDNWithString;
+class function CoDNWithString.CreateRemote(const MachineName: AnsiString): IADsDNWithString;
 begin
   Result := CreateRemoteComObject(MachineName, CLASS_DNWithString) as IADsDNWithString;
 end;

packages/winunits-jedi/src/jwaaf_irda.pas

@@ -241,7 +241,7 @@ type
   _SOCKADDR_IRDA = record
     irdaAddressFamily: u_short;
     irdaDeviceID: array [0..3] of u_char;
-    irdaServiceName: array [0..24] of Char;
+    irdaServiceName: array [0..24] of AnsiChar;
   end;
   {$EXTERNALSYM _SOCKADDR_IRDA}
   SOCKADDR_IRDA = _SOCKADDR_IRDA;
@@ -255,7 +255,7 @@ type
 
   _WINDOWS_IRDA_DEVICE_INFO = record
     irdaDeviceID: array [0..3] of u_char;
-    irdaDeviceName: array [0..21] of Char;
+    irdaDeviceName: array [0..21] of AnsiChar;
     irdaDeviceHints1: u_char;
     irdaDeviceHints2: u_char;
     irdaCharSet: u_char;
@@ -272,7 +272,7 @@ type
 
   _WCE_IRDA_DEVICE_INFO = record
     irdaDeviceID: array [0..3] of u_char;
-    irdaDeviceName: array [0..21] of Char;
+    irdaDeviceName: array [0..21] of AnsiChar;
     Reserved: array [0..1] of u_char;
   end;
   {$EXTERNALSYM _WCE_IRDA_DEVICE_INFO}
@@ -327,8 +327,8 @@ type
   TDeviceList = DEVICELIST;
 
   _WINDOWS_IAS_SET = record
-    irdaClassName: array [0..IAS_MAX_CLASSNAME - 1] of Char;
-    irdaAttribName: array [0..IAS_MAX_ATTRIBNAME - 1] of Char;
+    irdaClassName: array [0..IAS_MAX_CLASSNAME - 1] of AnsiChar;
+    irdaAttribName: array [0..IAS_MAX_ATTRIBNAME - 1] of AnsiChar;
     irdaAttribType: u_long;
     case Integer of
       0: (
@@ -353,8 +353,8 @@ type
 
   _WINDOWS_IAS_QUERY = record
     irdaDeviceID: array [0..3] of u_char;
-    irdaClassName: array [0..IAS_MAX_CLASSNAME - 1] of Char;
-    irdaAttribName: array [0..IAS_MAX_ATTRIBNAME - 1] of Char;
+    irdaClassName: array [0..IAS_MAX_CLASSNAME - 1] of AnsiChar;
+    irdaAttribName: array [0..IAS_MAX_ATTRIBNAME - 1] of AnsiChar;
     irdaAttribType: u_long;
     case Integer of
       0: (
@@ -378,8 +378,8 @@ type
   PWindowsIasQuery = LPWINDOWS_IAS_QUERY;
 
   _WCE_IAS_SET = record
-    irdaClassName: array [0..60] of Char;
-    irdaAttribName: array [0..60] of Char;
+    irdaClassName: array [0..60] of AnsiChar;
+    irdaAttribName: array [0..60] of AnsiChar;
     irdaAttribType: u_short;
     case Integer of
       0: (
@@ -404,8 +404,8 @@ type
 
   _WCE_IAS_QUERY = record
     irdaDeviceID: array [0..3] of u_char;
-    irdaClassName: array [0..60] of Char;
-    irdaAttribName: array [0..60] of Char;
+    irdaClassName: array [0..60] of AnsiChar;
+    irdaAttribName: array [0..60] of AnsiChar;
     irdaAttribType: u_short;
     case Integer of
       0: (irdaAttribInt: Integer);

packages/winunits-jedi/src/jwaatalkwsh.pas

@@ -226,12 +226,12 @@ const
 
 type
   WSH_NBP_NAME = record
-    ObjectNameLen: CHAR;
-    ObjectName: array [0..MAX_ENTITY - 1] of CHAR;
-    TypeNameLen: CHAR;
-    TypeName: array [0..MAX_ENTITY - 1] of CHAR;
-    ZoneNameLen: CHAR;
-    ZoneName: array [0..MAX_ENTITY - 1] of CHAR;
+    ObjectNameLen: AnsiChar;
+    ObjectName: array [0..MAX_ENTITY - 1] of AnsiChar;
+    TypeNameLen: AnsiChar;
+    TypeName: array [0..MAX_ENTITY - 1] of AnsiChar;
+    ZoneNameLen: AnsiChar;
+    ZoneName: array [0..MAX_ENTITY - 1] of AnsiChar;
   end;
   {$EXTERNALSYM WSH_NBP_NAME}
   PWSH_NBP_NAME = ^WSH_NBP_NAME;
@@ -272,7 +272,7 @@ type
   _WSH_LOOKUP_ZONES = record
     NoZones: ULONG;
     //
-    //  CHAR    Zones[] - null separated zones
+    //  AnsiChar    Zones[] - null separated zones
     //
   end;
   {$EXTERNALSYM _WSH_LOOKUP_ZONES}

packages/winunits-jedi/src/jwabluetoothapis.pas

@@ -1263,7 +1263,7 @@ type
         1: (int64: LONGLONG);                     // specificType == SDP_ST_INT64
         2: (int32: Integer);                         // specificType == SDP_ST_INT32
         3: (int16: SHORT);                        // specificType == SDP_ST_INT16
-        4: (int8: CHAR);                          // specificType == SDP_ST_INT8
+        4: (int8: AnsiChar);                          // specificType == SDP_ST_INT8
 
         // type == SDP_TYPE_UINT
         5: (uint128: SDP_ULARGE_INTEGER_16);      // specificType == SDP_ST_UINT128

packages/winunits-jedi/src/jwabthdef.pas

@@ -850,7 +850,7 @@ type
     //
     // name of the device
     //
-    name: array [0..BTH_MAX_NAME_SIZE - 1] of CHAR;
+    name: array [0..BTH_MAX_NAME_SIZE - 1] of AnsiChar;
   end;
   {$EXTERNALSYM _BTH_DEVICE_INFO}
   BTH_DEVICE_INFO = _BTH_DEVICE_INFO;

packages/winunits-jedi/src/jwacpl.pas

@@ -142,9 +142,9 @@ type
     dwHelpContext: DWORD;                // help context to use
     lData: LONG_PTR;                     // user defined data
     hIcon: HICON; // icon to use, this is owned by CONTROL.EXE (may be deleted)
-    szName: array [0..31] of CHAR;       // short name
-    szInfo: array [0..63] of CHAR;       // long name (status line)
-    szHelpFile: array [0..127] of CHAR;  // path to help file to use
+    szName: array [0..31] of AnsiChar;       // short name
+    szInfo: array [0..63] of AnsiChar;       // long name (status line)
+    szHelpFile: array [0..127] of AnsiChar;  // path to help file to use
   end;
   {$EXTERNALSYM tagNEWCPLINFOA}
   NEWCPLINFOA = tagNEWCPLINFOA;

packages/winunits-jedi/src/jwadbt.pas

@@ -458,7 +458,7 @@ type
     dbcp_size: DWORD;
     dbcp_devicetype: DWORD;
     dbcp_reserved: DWORD;
-    dbcp_name: array [0..0] of Char;
+    dbcp_name: array [0..0] of AnsiChar;
   end;
   {$EXTERNALSYM _DEV_BROADCAST_PORT_A}
   DEV_BROADCAST_PORT_A = _DEV_BROADCAST_PORT_A;
@@ -518,7 +518,7 @@ type
     dbcc_devicetype: DWORD;
     dbcc_reserved: DWORD;
     dbcc_classguid: GUID;
-    dbcc_name: array [0..0] of char;
+    dbcc_name: array [0..0] of AnsiChar;
   end;
   {$EXTERNALSYM _DEV_BROADCAST_DEVICEINTERFACE_A}
   DEV_BROADCAST_DEVICEINTERFACE_A = _DEV_BROADCAST_DEVICEINTERFACE_A;
@@ -658,7 +658,7 @@ type
   {$EXTERNALSYM PDEV_BROADCAST_USERDEFINED}
   _DEV_BROADCAST_USERDEFINED = record
     dbud_dbh: DEV_BROADCAST_HDR;
-    dbud_szName: array [0..0] of Char;
+    dbud_szName: array [0..0] of AnsiChar;
     //  BYTE        dbud_rgbUserDefined[];*/ /* User-defined contents */
   end;
   {$EXTERNALSYM _DEV_BROADCAST_USERDEFINED}

packages/winunits-jedi/src/jwadhcpssdk.pas

@@ -86,12 +86,12 @@ type
     Server: LPDHCP_IP_ADDRESS;
     ParameterRequestList: LPBYTE;
     ParameterRequestListLength: DWORD;
-    MachineName: PCHAR;
+    MachineName: PAnsiChar;
     MachineNameLength: DWORD;
     ClientHardwareAddressType: BYTE;
     ClientHardwareAddressLength: BYTE;
     ClientHardwareAddress: LPBYTE;
-    ClassIdentifier: PCHAR;
+    ClassIdentifier: PAnsiChar;
     ClassIdentifierLength: DWORD;
     VendorClass: LPBYTE;
     VendorClassLength: DWORD;
@@ -99,7 +99,7 @@ type
     DNSNameLength: DWORD;
     DNSName: LPBYTE;
     DSDomainNameRequested: LongBool;
-    DSDomainName: PCHAR;
+    DSDomainName: PAnsiChar;
     DSDomainNameLen: DWORD;
     ScopeId: LPDWORD;
   end;

packages/winunits-jedi/src/jwadsclient.pas

@@ -575,8 +575,8 @@ type
     dwMask: DWORD;
     dwState: DWORD;
     dwStateMask: DWORD;
-    szDisplayName: array [0..DSB_MAX_DISPLAYNAME_CHARS - 1] of CHAR;
-    szIconLocation: array [0..MAX_PATH - 1] of CHAR;
+    szDisplayName: array [0..DSB_MAX_DISPLAYNAME_CHARS - 1] of AnsiChar;
+    szIconLocation: array [0..MAX_PATH - 1] of AnsiChar;
     iIconResID: Integer;
   end;
   {$EXTERNALSYM DSBITEMA}

packages/winunits-jedi/src/jwadsgetdc.pas

@@ -272,7 +272,7 @@ function DsValidateSubnetName(SubnetName: LPCTSTR): DWORD; stdcall;
 type
   sockaddr = record
     sa_family: Word;                  // address family
-    sa_data: array [0..13] of Char;   // up to 14 bytes of direct address
+    sa_data: array [0..13] of AnsiChar;   // up to 14 bytes of direct address
   end;
   {$EXTERNALSYM sockaddr}
 
@@ -303,7 +303,7 @@ type
 {$ENDIF JWA_WINSOCK_2}
 
 function DsAddressToSiteNamesA(ComputerName: LPCSTR; EntryCount: DWORD;
-  SocketAddresses: PSOCKET_ADDRESS; var SiteNames: PPChar): DWORD; stdcall;
+  SocketAddresses: PSOCKET_ADDRESS; var SiteNames: PPAnsiChar): DWORD; stdcall;
 {$EXTERNALSYM DsAddressToSiteNamesA}
 function DsAddressToSiteNamesW(ComputerName: LPCWSTR; EntryCount: DWORD;
   SocketAddresses: PSOCKET_ADDRESS; var SiteNames: PPWideChar): DWORD; stdcall;
@@ -313,7 +313,7 @@ function DsAddressToSiteNames(ComputerName: LPCTSTR; EntryCount: DWORD;
 {$EXTERNALSYM DsAddressToSiteNames}
 
 function DsAddressToSiteNamesExA(ComputerName: LPCSTR; EntryCount: DWORD;
-  SocketAddresses: PSOCKET_ADDRESS; var SiteNames, SubnetNames: PPChar): DWORD; stdcall;
+  SocketAddresses: PSOCKET_ADDRESS; var SiteNames, SubnetNames: PPAnsiChar): DWORD; stdcall;
 {$EXTERNALSYM DsAddressToSiteNamesExA}
 function DsAddressToSiteNamesExW(ComputerName: LPCWSTR; EntryCount: DWORD;
   SocketAddresses: PSOCKET_ADDRESS; var SiteNames, SubnetNames: PPWideChar): DWORD; stdcall;
@@ -458,7 +458,7 @@ function DsMergeForestTrustInformationW(DomainName: LPCWSTR; NewForestTrustInfo,
 {$EXTERNALSYM DsMergeForestTrustInformationW}
 
 function DsGetDcSiteCoverageA(ServerName: LPCSTR; var EntryCount: ULONG;
-  var SiteNames: PPChar): DWORD; stdcall;
+  var SiteNames: PPAnsiChar): DWORD; stdcall;
 {$EXTERNALSYM DsGetDcSiteCoverageA}
 function DsGetDcSiteCoverageW(ServerName: LPCWSTR; var EntryCount: ULONG;
   var SiteNames: PPWideChar): DWORD; stdcall;

packages/winunits-jedi/src/jwahtmlhelp.pas

@@ -411,7 +411,7 @@ type
     clrForeGround: COLORREF;               // use -1 for default
     clrBackground: COLORREF;               // use -1 for default
     rcMargins: RECT;                       // amount of space between edges of window and text, -1 for each member to ignore
-    pszFont: LPCTSTR;                      // facename, point size, char set, BOLD ITALIC UNDERLINE
+    pszFont: LPCTSTR;                      // facename, point size, AnsiChar set, BOLD ITALIC UNDERLINE
   end;
   {$EXTERNALSYM tagHH_POPUP}
   HH_POPUP = tagHH_POPUP;
@@ -764,26 +764,26 @@ const
 
 {$IFDEF DYNAMIC_LINK}
 
-function GetOCXPath: string;
+function GetOCXPath: ansistring;
 const
   HHPathRegKey = 'CLSID\{adb880a6-d8ff-11cf-9377-00aa003b7a11}\InprocServer32';
 var
   HHKey: HKEY;
   R, PathSize, ValueType: DWORD;
-  Path: string;
+  Path: ansistring;
 begin
   R := ERROR_PATH_NOT_FOUND;
-  if RegOpenKeyExA(HKEY_CLASSES_ROOT, PChar(HHPathRegKey), 0, KEY_QUERY_VALUE, HHKey) = ERROR_SUCCESS then
+  if RegOpenKeyExA(HKEY_CLASSES_ROOT, PAnsiChar(HHPathRegKey), 0, KEY_QUERY_VALUE, HHKey) = ERROR_SUCCESS then
   begin
     ValueType := 0;
     PathSize := 0;
-    if RegQueryValueExA(HHKey, PChar(''), nil, @ValueType, nil, @PathSize) = ERROR_SUCCESS then
+    if RegQueryValueExA(HHKey, PAnsiChar(''), nil, @ValueType, nil, @PathSize) = ERROR_SUCCESS then
     begin
       if ValueType = REG_SZ then
       begin
         SetLength(Path, PathSize);
-        R := RegQueryValueExA(HHKey, PChar(''), nil, @ValueType, PByte(Path), @PathSize);
-        Result := PChar(Path);
+        R := RegQueryValueExA(HHKey, PAnsiChar(''), nil, @ValueType, PByte(Path), @PathSize);
+        Result := PAnsiChar(Path);
       end;
     end;
     RegCloseKey(HHKey);

packages/winunits-jedi/src/jwaimagehlp.pas

@@ -934,7 +934,7 @@ type
     Size: DWORD; // estimated size of symbol, can be zero
     Flags: DWORD; // info about the symbols, see the SYMF defines
     MaxNameLength: DWORD; // maximum size of symbol name in 'Name'
-    Name: array [0..0] of CHAR; // symbol name (null terminated string)
+    Name: array [0..0] of AnsiChar; // symbol name (null terminated string)
   end;
   {$EXTERNALSYM _IMAGEHLP_SYMBOL64}
   IMAGEHLP_SYMBOL64 = _IMAGEHLP_SYMBOL64;
@@ -944,7 +944,7 @@ type
 
   _IMAGEHLP_SYMBOL64_PACKAGE = record
     sym: IMAGEHLP_SYMBOL64;
-    name: array [0..MAX_SYM_NAME] of CHAR;
+    name: array [0..MAX_SYM_NAME] of AnsiChar;
   end;
   {$EXTERNALSYM _IMAGEHLP_SYMBOL64_PACKAGE}
   IMAGEHLP_SYMBOL64_PACKAGE = _IMAGEHLP_SYMBOL64_PACKAGE;
@@ -971,7 +971,7 @@ type
     Size: DWORD; // estimated size of symbol, can be zero
     Flags: DWORD; // info about the symbols, see the SYMF defines
     MaxNameLength: DWORD; // maximum size of symbol name in 'Name'
-    Name: array [0..0] of CHAR; // symbol name (null terminated string)
+    Name: array [0..0] of AnsiChar; // symbol name (null terminated string)
   end;
   {$EXTERNALSYM _IMAGEHLP_SYMBOL}
   IMAGEHLP_SYMBOL = _IMAGEHLP_SYMBOL;
@@ -981,7 +981,7 @@ type
 
   _IMAGEHLP_SYMBOL_PACKAGE = record
     sym: IMAGEHLP_SYMBOL;
-    name: array [0..MAX_SYM_NAME] of CHAR;
+    name: array [0..MAX_SYM_NAME] of AnsiChar;
   end;
   {$EXTERNALSYM _IMAGEHLP_SYMBOL_PACKAGE}
   IMAGEHLP_SYMBOL_PACKAGE = _IMAGEHLP_SYMBOL_PACKAGE;
@@ -1007,9 +1007,9 @@ type
     CheckSum: DWORD; // checksum from the pe header
     NumSyms: DWORD; // number of symbols in the symbol table
     SymType: SYM_TYPE; // type of symbols loaded
-    ModuleName: array [0..3] of CHAR; // module name
-    ImageName: array [0..255] of CHAR; // image name
-    LoadedImageName: array [0..255] of CHAR; // symbol file name
+    ModuleName: array [0..3] of AnsiChar; // module name
+    ImageName: array [0..255] of AnsiChar; // image name
+    LoadedImageName: array [0..255] of AnsiChar; // symbol file name
   end;
   {$EXTERNALSYM _IMAGEHLP_MODULE64}
   IMAGEHLP_MODULE64 = _IMAGEHLP_MODULE64;
@@ -1047,9 +1047,9 @@ type
     CheckSum: DWORD; // checksum from the pe header
     NumSyms: DWORD; // number of symbols in the symbol table
     SymType: SYM_TYPE; // type of symbols loaded
-    ModuleName: array [0..31] of CHAR; // module name
-    ImageName: array [0..255] of CHAR; // image name
-    LoadedImageName: array [0..255] of CHAR; // symbol file name
+    ModuleName: array [0..31] of AnsiChar; // module name
+    ImageName: array [0..255] of AnsiChar; // image name
+    LoadedImageName: array [0..255] of AnsiChar; // symbol file name
   end;
   {$EXTERNALSYM _IMAGEHLP_MODULE}
   IMAGEHLP_MODULE = _IMAGEHLP_MODULE;
@@ -1087,7 +1087,7 @@ type
     SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE64)
     Key: PVOID; // internal
     LineNumber: DWORD; // line number in file
-    FileName: PCHAR; // full filename
+    FileName: PAnsiChar; // full filename
     Address: DWORD64; // first instruction of line
   end;
   {$EXTERNALSYM _IMAGEHLP_LINE64}
@@ -1102,7 +1102,7 @@ type
     SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
     Key: PVOID; // internal
     LineNumber: DWORD; // line number in file
-    FileName: PCHAR; // full filename
+    FileName: PAnsiChar; // full filename
     Address: DWORD; // first instruction of line
   end;
   {$EXTERNALSYM _IMAGEHLP_LINE}
@@ -1118,7 +1118,7 @@ type
 type
   _SOURCEFILE = record
     ModBase: DWORD64;                // base address of loaded module
-    FileName: PCHAR;                 // full filename of source
+    FileName: PAnsiChar;                 // full filename of source
   end;
   {$EXTERNALSYM _SOURCEFILE}
   SOURCEFILE = _SOURCEFILE;
@@ -1186,7 +1186,7 @@ type
   _IMAGEHLP_CBA_EVENT = record
     severity: DWORD;                                     // values from sevInfo to sevFatal
     code: DWORD;                                         // numerical code IDs the error
-    desc: PCHAR;                                         // may contain a text description of the error
+    desc: PAnsiChar;                                         // may contain a text description of the error
     object_: PVOID;                                      // value dependant upon the error code
   end;
   {$EXTERNALSYM _IMAGEHLP_CBA_EVENT}
@@ -1204,7 +1204,7 @@ type
     BaseOfImage: DWORD64; // base load address of module
     CheckSum: DWORD; // checksum from the pe header
     TimeDateStamp: DWORD; // date/time stamp from pe header
-    FileName: array [0..MAX_PATH - 1] of CHAR; // symbols file or image name
+    FileName: array [0..MAX_PATH - 1] of AnsiChar; // symbols file or image name
     Reparse: ByteBool; // load failure reparse
     hFile: HANDLE; // file handle, if passed
     Flags: DWORD; //
@@ -1229,7 +1229,7 @@ type
     BaseOfImage: DWORD; // base load address of module
     CheckSum: DWORD; // checksum from the pe header
     TimeDateStamp: DWORD; // date/time stamp from pe header
-    FileName: array [0..MAX_PATH - 1] of CHAR; // symbols file or image name
+    FileName: array [0..MAX_PATH - 1] of AnsiChar; // symbols file or image name
     Reparse: ByteBool; // load failure reparse
     hFile: HANDLE; // file handle, if passed    
   end;
@@ -1507,7 +1507,7 @@ type
   _IMAGEHLP_SYMBOL_SRC = record
     sizeofstruct: DWORD;
     type_: DWORD;
-    file_: array [0..MAX_PATH - 1] of Char;
+    file_: array [0..MAX_PATH - 1] of AnsiChar;
   end;
   {$EXTERNALSYM _IMAGEHLP_SYMBOL_SRC}
   IMAGEHLP_SYMBOL_SRC = _IMAGEHLP_SYMBOL_SRC;
@@ -1546,7 +1546,7 @@ type
     Tag: ULONG; // pdb classification
     NameLen: ULONG; // Actual length of name
     MaxNameLen: ULONG;
-    Name: array [0..0] of CHAR; // Name of symbol
+    Name: array [0..0] of AnsiChar; // Name of symbol
   end;
   {$EXTERNALSYM _SYMBOL_INFO}
   SYMBOL_INFO = _SYMBOL_INFO;
@@ -1556,7 +1556,7 @@ type
 
   _SYMBOL_INFO_PACKAGE = record
     si: SYMBOL_INFO;
-    name: array [0..MAX_SYM_NAME] of CHAR;
+    name: array [0..MAX_SYM_NAME] of AnsiChar;
   end;
   {$EXTERNALSYM _SYMBOL_INFO_PACKAGE}
   SYMBOL_INFO_PACKAGE = _SYMBOL_INFO_PACKAGE;

packages/winunits-jedi/src/jwaiptypes.pas

@@ -113,7 +113,7 @@ type
   PIP_MASK_STRING = ^IP_MASK_STRING;
   {$EXTERNALSYM PIP_MASK_STRING}
   IP_ADDRESS_STRING = record
-    S: array [0..15] of Char;
+    S: array [0..15] of AnsiChar;
   end;
   {$EXTERNALSYM IP_ADDRESS_STRING}
   PIP_ADDRESS_STRING = ^IP_ADDRESS_STRING;
@@ -152,8 +152,8 @@ type
   _IP_ADAPTER_INFO = record
     Next: PIP_ADAPTER_INFO;
     ComboIndex: DWORD;
-    AdapterName: array [0..MAX_ADAPTER_NAME_LENGTH + 3] of Char;
-    Description: array [0..MAX_ADAPTER_DESCRIPTION_LENGTH + 3] of Char;
+    AdapterName: array [0..MAX_ADAPTER_NAME_LENGTH + 3] of AnsiChar;
+    Description: array [0..MAX_ADAPTER_DESCRIPTION_LENGTH + 3] of AnsiChar;
     AddressLength: UINT;
     Address: array [0..MAX_ADAPTER_ADDRESS_LENGTH - 1] of BYTE;
     Index: DWORD;
@@ -397,7 +397,7 @@ type
           IfIndex: DWORD);
     end;
     Next: PIP_ADAPTER_ADDRESSES;
-    AdapterName: PCHAR;
+    AdapterName: PAnsiChar;
     FirstUnicastAddress: PIP_ADAPTER_UNICAST_ADDRESS;
     FirstAnycastAddress: PIP_ADAPTER_ANYCAST_ADDRESS;
     FirstMulticastAddress: PIP_ADAPTER_MULTICAST_ADDRESS;
@@ -467,12 +467,12 @@ type
   PFIXED_INFO = ^FIXED_INFO;
   {$EXTERNALSYM PFIXED_INFO}
   FIXED_INFO = record
-    HostName: array [0..MAX_HOSTNAME_LEN + 3] of Char;
-    DomainName: array[0..MAX_DOMAIN_NAME_LEN + 3] of Char;
+    HostName: array [0..MAX_HOSTNAME_LEN + 3] of AnsiChar;
+    DomainName: array[0..MAX_DOMAIN_NAME_LEN + 3] of AnsiChar;
     CurrentDnsServer: PIP_ADDR_STRING;
     DnsServerList: IP_ADDR_STRING;
     NodeType: UINT;
-    ScopeId: array [0..MAX_SCOPE_ID_LEN + 3] of Char;
+    ScopeId: array [0..MAX_SCOPE_ID_LEN + 3] of AnsiChar;
     EnableRouting: UINT;
     EnableProxy: UINT;
     EnableDns: UINT;

packages/winunits-jedi/src/jwalmalert.pas

@@ -251,7 +251,7 @@ implementation
 
 function ALERT_OTHER_INFO(x: Pointer): Pointer;
 begin
-  Result := Pointer(PChar(x) + SizeOf(STD_ALERT));
+  Result := Pointer(PAnsiChar(x) + SizeOf(STD_ALERT));
 end;
 
 {$IFDEF DYNAMIC_LINK}

packages/winunits-jedi/src/jwalmremutl.pas

@@ -71,7 +71,7 @@ type
   DESC_CHAR = WCHAR;
   {$EXTERNALSYM DESC_CHAR}
   {$ELSE}
-  DESC_CHAR = Char;
+  DESC_CHAR = AnsiChar;
   {$EXTERNALSYM DESC_CHAR}
   {$ENDIF DESC_CHAR_UNICODE}
   TDescChar = DESC_CHAR;

packages/winunits-jedi/src/jwalpmapi.pas

@@ -909,7 +909,7 @@ type
 
   IS_ADSPEC_BODY = record
     adspec_mh: IntServMainHdr;      // Main header
-    adspec_genparms: GenAdspecParams;// General char parm fragment
+    adspec_genparms: GenAdspecParams;// General AnsiChar parm fragment
     (*
      *  Followed by variable-length fragments for some or all
      *  services.  These can be minimal length fragments.

packages/winunits-jedi/src/jwamsiquery.pas

@@ -719,7 +719,7 @@ function MsiRecordSetStream(hRecord: MSIHANDLE; iField: UINT; szFilePath: LPCTST
 // The number of bytes transferred is returned through the argument
 // If no more bytes are available, ERROR_SUCCESS is still returned
 
-function MsiRecordReadStream(hRecord: MSIHANDLE; iField: UINT; szDataBuf: PChar;
+function MsiRecordReadStream(hRecord: MSIHANDLE; iField: UINT; szDataBuf: PAnsiChar;
   var pcbDataBuf: DWORD): UINT; stdcall;
 {$EXTERNALSYM MsiRecordReadStream}
 

packages/winunits-jedi/src/jwamswsock.pas

@@ -138,7 +138,7 @@ const
 // Microsoft extended APIs.
 //
 
-function WSARecvEx(s: TSocket; buf: PChar; len: Integer; var flags: Integer): Integer; stdcall;
+function WSARecvEx(s: TSocket; buf: PAnsiChar; len: Integer; var flags: Integer): Integer; stdcall;
 {$EXTERNALSYM WSARecvEx}
 
 type
@@ -372,15 +372,15 @@ type
     case Integer of
       0: (
         // header.type -> NLA_RAW_DATA
-        rawData: array [0..0] of CHAR);
+        rawData: array [0..0] of AnsiChar);
       1: (
         // header.type -> NLA_INTERFACE
         dwType: DWORD;
         dwSpeed: DWORD;
-        adapterName: array [0..0] of CHAR);
+        adapterName: array [0..0] of AnsiChar);
       2: (
         // header.type -> NLA_802_1X_LOCATION
-        information: array [0..0] of CHAR);
+        information: array [0..0] of AnsiChar);
       3: (
         // header.type -> NLA_CONNECTIVITY
         type_: NLA_CONNECTIVITY_TYPE;

packages/winunits-jedi/src/jwanative.pas

@@ -400,7 +400,7 @@ type
     Flags: UCHAR;
     EaNameLength: UCHAR;
     EaValueLength: USHORT;
-    EaName: array[0..0] of CHAR;
+    EaName: array[0..0] of AnsiChar;
   end;
   FILE_FULL_EA_INFORMATION = _FILE_FULL_EA_INFORMATION;
   PFILE_FULL_EA_INFORMATION = ^FILE_FULL_EA_INFORMATION;
@@ -982,7 +982,7 @@ type
     Unknown: USHORT;
     LoadCount: USHORT;
     ModuleNameOffset: USHORT;
-    ImageName: array[0..255] of CHAR;
+    ImageName: array[0..255] of AnsiChar;
   end;
   SYSTEM_MODULE_INFORMATION = _SYSTEM_MODULE_INFORMATION;
   PSYSTEM_MODULE_INFORMATION = ^SYSTEM_MODULE_INFORMATION;
@@ -1123,7 +1123,7 @@ type
   PSystemCacheInformation = ^TSystemCacheInformation;
 
   _SYSTEM_POOL_TAG_INFORMATION = record // Information Class 22
-    Tag: array[0..3] of CHAR;
+    Tag: array[0..3] of AnsiChar;
     PagedPoolAllocs: ULONG;
     PagedPoolFrees: ULONG;
     PagedPoolUsage: ULONG;
@@ -1345,7 +1345,7 @@ type
     Allocated: ByteBool;
     Unknown: USHORT;
     Size: ULONG;
-    Tag: array[0..3] of CHAR;
+    Tag: array[0..3] of AnsiChar;
   end;
   SYSTEM_POOL_BLOCK = _SYSTEM_POOL_BLOCK;
   PSYSTEM_POOL_BLOCK = ^SYSTEM_POOL_BLOCK;
@@ -1659,7 +1659,7 @@ type
     Unknown: USHORT;
     LoadCount: USHORT;
     ModuleNameOffset: USHORT;
-    ImageName: array[0..255] of CHAR;
+    ImageName: array[0..255] of AnsiChar;
   end;
   DEBUG_MODULE_INFORMATION = _DEBUG_MODULE_INFORMATION;
   PDEBUG_MODULE_INFORMATION = ^DEBUG_MODULE_INFORMATION;
@@ -1850,7 +1850,7 @@ type
   _FILE_GET_EA_INFORMATION = record
     NextEntryOffset: ULONG;
     EaNameLength: UCHAR;
-    EaName: array[0..0] of CHAR;
+    EaName: array[0..0] of AnsiChar;
   end;
   FILE_GET_EA_INFORMATION = _FILE_GET_EA_INFORMATION;
   PFILE_GET_EA_INFORMATION = ^FILE_GET_EA_INFORMATION;
@@ -2474,7 +2474,7 @@ type
     Flags: UCHAR;
     EaNameLength: UCHAR;
     EaValueLength: USHORT;
-    EaName: array[0..0] of CHAR;
+    EaName: array[0..0] of AnsiChar;
     // UCHAR EaData[];
   end;
   EA_ATTRIBUTE = _EA_ATTRIBUTE;
@@ -3187,7 +3187,7 @@ type
   (*000*)CallBx86Eip: PULONG;
   (*004*)DeallocationCpu: PVOID;
   (*008*)UseKnownWx86Dll: BOOLEAN;
-  (*009*)OleStubInvoked: CHAR;
+  (*009*)OleStubInvoked: AnsiChar;
   end;
   Wx86ThreadState = _Wx86ThreadState;
   PWx86ThreadState = ^_Wx86ThreadState;
@@ -3196,7 +3196,7 @@ type
 // Verified in XP using WinDbg
   _TEB_ACTIVE_FRAME_CONTEXT = record // not packed!
   (*000*)Flags: ULONG;
-  (*004*)FrameName: PCHAR;
+  (*004*)FrameName: PAnsiChar;
   end;
   TEB_ACTIVE_FRAME_CONTEXT = _TEB_ACTIVE_FRAME_CONTEXT;
   PTEB_ACTIVE_FRAME_CONTEXT = ^_TEB_ACTIVE_FRAME_CONTEXT;
@@ -6319,7 +6319,7 @@ function  RtlAllocateHeap(
 
 // Compatibility: NT3, NT4, W2K, WXP, 2K3
 function  RtlAnsiCharToUnicodeChar(
-    AnsiChar : CHAR
+    AnsiChar : AnsiChar
   ): WCHAR; stdcall; {$IFNDEF RTDL}external ntdll;{$ENDIF}
 
 // Documented in the DDK.
@@ -6404,7 +6404,7 @@ procedure RtlAssert(
     FailedAssertion : PVOID;
     FileName : PVOID;
     LineNumber : ULONG;
-    Message : PCHAR
+    Message : PAnsiChar
   ); stdcall; {$IFNDEF RTDL}external ntdll;{$ENDIF}
 {$IFNDEF JWA_INCLUDEMODE}
 // The function RtlCaptureContext() from Kernel32.dll is an export
@@ -6625,7 +6625,7 @@ function  RtlCreateUnicodeString(
 // Compatibility: NT3, NT4, W2K, WXP, 2K3
 function  RtlCreateUnicodeStringFromAsciiz(
     DestinationString : PUNICODE_STRING;
-    SourceString : PCHAR
+    SourceString : PAnsiChar
   ): BOOLEAN; stdcall; {$IFNDEF RTDL}external ntdll;{$ENDIF}
 
 // Compatibility: NT3, NT4, W2K, WXP, 2K3
@@ -7358,7 +7358,7 @@ function  RtlIntegerToChar(
     Value : ULONG;
     Base : ULONG;
     Length : ULONG;
-    Str : PCHAR
+    Str : PAnsiChar
   ): NTSTATUS; stdcall; {$IFNDEF RTDL}external ntdll;{$ENDIF}
 
 // Documented in the DDK.
@@ -7496,7 +7496,7 @@ function  RtlLargeIntegerToChar(
     Value : PLARGE_INTEGER;
     Base : ULONG;
     BufferLength : ULONG;
-    Buffer : PCHAR
+    Buffer : PAnsiChar
   ): NTSTATUS; stdcall; {$IFNDEF RTDL}external ntdll;{$ENDIF}
 
 // The function LeaveCriticalSection() from Kernel32.dll is an export
@@ -7633,7 +7633,7 @@ function  RtlOemToUnicodeN(
     UnicodeString : PWSTR;
     UnicodeSize : ULONG;
     var ResultSize : ULONG;
-    OemString : PCHAR;
+    OemString : PAnsiChar;
     OemSize : ULONG
   ): NTSTATUS; stdcall; {$IFNDEF RTDL}external ntdll;{$ENDIF}
 
@@ -8142,7 +8142,7 @@ function  RtlUpcaseUnicodeStringToOemString(
 
 // Compatibility: NT3, NT4, W2K, WXP, 2K3
 function  RtlUpcaseUnicodeToMultiByteN(
-    MbString : PCHAR;
+    MbString : PAnsiChar;
     MbSize : ULONG;
     var ResultSize : ULONG;
     UnicodeString : PWSTR;
@@ -8151,7 +8151,7 @@ function  RtlUpcaseUnicodeToMultiByteN(
 
 // Compatibility: NT3, NT4, W2K, WXP, 2K3
 function  RtlUpcaseUnicodeToOemN(
-    OemString : PCHAR;
+    OemString : PAnsiChar;
     OemSize : ULONG;
     var ResultSize : ULONG;
     UnicodeString : PWSTR;
@@ -8161,8 +8161,8 @@ function  RtlUpcaseUnicodeToOemN(
 // Documented in the DDK.
 // Compatibility: NT3, NT4, W2K, WXP, 2K3
 function  RtlUpperChar(
-    Character : CHAR
-  ): CHAR; stdcall; {$IFNDEF RTDL}external ntdll;{$ENDIF}
+    Character : AnsiChar
+  ): AnsiChar; stdcall; {$IFNDEF RTDL}external ntdll;{$ENDIF}
 
 // Documented in the DDK.
 // Compatibility: NT3, NT4, W2K, WXP, 2K3
@@ -8769,7 +8769,7 @@ type
   TFNRtlAllocateAndInitializeSid = function (pIdentifierAuthority: PSID_IDENTIFIER_AUTHORITY; SubAuthorityCount: BYTE; nSubAuthority0: DWORD; nSubAuthority1: DWORD; nSubAuthority2: DWORD; nSubAuthority3: DWORD; nSubAuthority4: DWORD;
     nSubAuthority5: DWORD; nSubAuthority6: DWORD; nSubAuthority7: DWORD; var pSid: PSID): BOOL; stdcall;
   TFNRtlAllocateHeap = function (hHeap: HANDLE; dwFlags: ULONG; Size: ULONG): PVOID; stdcall;
-  TFNRtlAnsiCharToUnicodeChar = function (AnsiChar: CHAR): WCHAR; stdcall;
+  TFNRtlAnsiCharToUnicodeChar = function (AnsiChar: AnsiChar): WCHAR; stdcall;
   TFNRtlAnsiStringToUnicodeSize = function (AnsiString: PANSI_STRING): ULONG; stdcall;
   TFNRtlAnsiStringToUnicodeString = function (DestinationString: PUNICODE_STRING; SourceString: PANSI_STRING; AllocateDestinationString: BOOLEAN): NTSTATUS; stdcall;
   TFNRtlAppendAsciizToString = function (DestinationString: PSTRING; AppendThisString: LPCSTR): NTSTATUS; stdcall;
@@ -8780,7 +8780,7 @@ type
   TFNRtlAreAnyAccessesGranted = function (GrantedAccess: ACCESS_MASK; WantedAccess: ACCESS_MASK): BOOLEAN; stdcall;
   TFNRtlAreBitsClear = function (BitMapHeader: PRTL_BITMAP; StartingIndex: ULONG; Length: ULONG): BOOLEAN; stdcall;
   TFNRtlAreBitsSet = function (BitMapHeader: PRTL_BITMAP; StartingIndex: ULONG; Length: ULONG): BOOLEAN; stdcall;
-  TFNRtlAssert = procedure(FailedAssertion: PVOID; FileName: PVOID; LineNumber: ULONG; Message: PCHAR); stdcall;
+  TFNRtlAssert = procedure(FailedAssertion: PVOID; FileName: PVOID; LineNumber: ULONG; Message: PAnsiChar); stdcall;
   TFNRtlCaptureContext = procedure(ContextRecord: PCONTEXT); stdcall;
   TFNRtlCharToInteger = function (Str: PCSZ; Base: ULONG; Value: PULONG): NTSTATUS; stdcall;
   TFNRtlCheckForOrphanedCriticalSections = procedure(hThread: HANDLE); stdcall;
@@ -8809,7 +8809,7 @@ type
   TFNRtlCreateRegistryKey = function (RelativeTo: ULONG; Path: PWSTR): NTSTATUS; stdcall;
   TFNRtlCreateSecurityDescriptor = function (SecurityDescriptor: PSECURITY_DESCRIPTOR; Revision: ULONG): NTSTATUS; stdcall;
   TFNRtlCreateUnicodeString = function (DestinationString: PUNICODE_STRING; SourceString: PWSTR): BOOLEAN; stdcall;
-  TFNRtlCreateUnicodeStringFromAsciiz = function (DestinationString: PUNICODE_STRING; SourceString: PCHAR): BOOLEAN; stdcall;
+  TFNRtlCreateUnicodeStringFromAsciiz = function (DestinationString: PUNICODE_STRING; SourceString: PAnsiChar): BOOLEAN; stdcall;
   TFNRtlCreateUserProcess = function (ImageFileName: PUNICODE_STRING; Attributes: ULONG; ProcessParameters: PRTL_USER_PROCESS_PARAMETERS; ProcessSecurityDescriptor: PSECURITY_DESCRIPTOR; ThreadSecurityDescriptor: PSECURITY_DESCRIPTOR;
     ParentProcess: HANDLE; InheritHandles: BOOLEAN; DebugPort: HANDLE; ExceptionPort: HANDLE; ProcessInfo: PRTL_PROCESS_INFORMATION): NTSTATUS; stdcall;
   TFNRtlCreateUserThread = function (hProcess: HANDLE; SecurityDescriptor: PSECURITY_DESCRIPTOR; CreateSuspended: BOOLEAN; StackZeroBits: ULONG; StackReserve: ULONG; StackCommit: ULONG; lpStartAddress: PTHREAD_START_ROUTINE;
@@ -8910,7 +8910,7 @@ type
   TFNRtlInitializeSListHead = procedure(ListHead: PSLIST_HEADER); stdcall;
   TFNRtlInitializeSid = function (pSid: PSID; pIdentifierAuthority: PSID_IDENTIFIER_AUTHORITY; nSubAuthorityCount: UCHAR): NTSTATUS; stdcall;
   TFNRtlInt64ToUnicodeString = function (Value: ULONGLONG; Base: ULONG; Str: PUNICODE_STRING): NTSTATUS; stdcall;
-  TFNRtlIntegerToChar = function (Value: ULONG; Base: ULONG; Length: ULONG; Str: PCHAR): NTSTATUS; stdcall;
+  TFNRtlIntegerToChar = function (Value: ULONG; Base: ULONG; Length: ULONG; Str: PAnsiChar): NTSTATUS; stdcall;
   TFNRtlIntegerToUnicodeString = function (Value: ULONG; Base: ULONG; Str: PUNICODE_STRING): NTSTATUS; stdcall;
   TFNRtlInterlockedFlushSList = function (ListHead: PSLIST_HEADER): PSLIST_ENTRY; stdcall;
   TFNRtlInterlockedPopEntrySList = function (ListHead: PSLIST_HEADER): PSLIST_ENTRY; stdcall;
@@ -8930,7 +8930,7 @@ type
   TFNRtlLargeIntegerShiftLeft = function (LargeInteger: LARGE_INTEGER; ShiftCount: CCHAR): LARGE_INTEGER; stdcall;
   TFNRtlLargeIntegerShiftRight = function (LargeInteger: LARGE_INTEGER; ShiftCount: CCHAR): LARGE_INTEGER; stdcall;
   TFNRtlLargeIntegerSubtract = function (Number: LARGE_INTEGER; Subtrahend: LARGE_INTEGER): LARGE_INTEGER; stdcall;
-  TFNRtlLargeIntegerToChar = function (Value: PLARGE_INTEGER; Base: ULONG; BufferLength: ULONG; Buffer: PCHAR): NTSTATUS; stdcall;
+  TFNRtlLargeIntegerToChar = function (Value: PLARGE_INTEGER; Base: ULONG; BufferLength: ULONG; Buffer: PAnsiChar): NTSTATUS; stdcall;
   TFNRtlLeaveCriticalSection = procedure(lpCriticalSection: PRTL_CRITICAL_SECTION); stdcall;
   TFNRtlLengthRequiredSid = function (nSubAuthorityCount: ULONG): ULONG; stdcall;
   TFNRtlLengthSecurityDescriptor = function (SecurityDescriptor: PSECURITY_DESCRIPTOR): ULONG; stdcall;
@@ -8949,7 +8949,7 @@ type
   TFNRtlNumberOfSetBits = function (BitMapHeader: PRTL_BITMAP): ULONG; stdcall;
   TFNRtlOemStringToUnicodeSize = function (AnsiString: POEM_STRING): ULONG; stdcall;
   TFNRtlOemStringToUnicodeString = function (DestinationString: PUNICODE_STRING; SourceString: POEM_STRING; AllocateDestinationString: BOOLEAN): NTSTATUS; stdcall;
-  TFNRtlOemToUnicodeN = function (UnicodeString: PWSTR; UnicodeSize: ULONG; var ResultSize: ULONG; OemString: PCHAR; OemSize: ULONG): NTSTATUS; stdcall;
+  TFNRtlOemToUnicodeN = function (UnicodeString: PWSTR; UnicodeSize: ULONG; var ResultSize: ULONG; OemString: PAnsiChar; OemSize: ULONG): NTSTATUS; stdcall;
   TFNRtlOpenCurrentUser = function (samDesired: ACCESS_MASK; phkResult: PHKEY): NTSTATUS; stdcall;
   TFNRtlPrefixString = function (String1: PANSI_STRING; String2: PANSI_STRING; CaseInsensitive: BOOLEAN): BOOLEAN; stdcall;
   TFNRtlPrefixUnicodeString = function (String1: PUNICODE_STRING; String2: PUNICODE_STRING; CaseInsensitive: BOOLEAN): BOOLEAN; stdcall;
@@ -9009,9 +9009,9 @@ type
   TFNRtlUpcaseUnicodeStringToAnsiString = function (DestinationString: PSTRING; SourceString: PUNICODE_STRING; AllocateDestinationString: BOOLEAN): NTSTATUS; stdcall;
   TFNRtlUpcaseUnicodeStringToCountedOemString = function (DestinationString: PSTRING; SourceString: PUNICODE_STRING; AllocateDestinationString: BOOLEAN): NTSTATUS; stdcall;
   TFNRtlUpcaseUnicodeStringToOemString = function (DestinationString: PSTRING; SourceString: PUNICODE_STRING; AllocateDestinationString: BOOLEAN): NTSTATUS; stdcall;
-  TFNRtlUpcaseUnicodeToMultiByteN = function (MbString: PCHAR; MbSize: ULONG; var ResultSize: ULONG; UnicodeString: PWSTR; UnicodeSize: ULONG): NTSTATUS; stdcall;
-  TFNRtlUpcaseUnicodeToOemN = function (OemString: PCHAR; OemSize: ULONG; var ResultSize: ULONG; UnicodeString: PWSTR; UnicodeSize: ULONG): NTSTATUS; stdcall;
-  TFNRtlUpperChar = function (Character: CHAR): CHAR; stdcall;
+  TFNRtlUpcaseUnicodeToMultiByteN = function (MbString: PAnsiChar; MbSize: ULONG; var ResultSize: ULONG; UnicodeString: PWSTR; UnicodeSize: ULONG): NTSTATUS; stdcall;
+  TFNRtlUpcaseUnicodeToOemN = function (OemString: PAnsiChar; OemSize: ULONG; var ResultSize: ULONG; UnicodeString: PWSTR; UnicodeSize: ULONG): NTSTATUS; stdcall;
+  TFNRtlUpperChar = function (Character: AnsiChar): AnsiChar; stdcall;
   TFNRtlUpperString = procedure(DestinationString: PSTRING; SourceString: PSTRING); stdcall;
   TFNRtlValidAcl = function (Acl: PACL): BOOLEAN; stdcall;
   TFNRtlValidRelativeSecurityDescriptor = function (SecurityDescriptorInput: PSECURITY_DESCRIPTOR; SecurityDescriptorLength: ULONG; RequiredInformation: SECURITY_INFORMATION): BOOLEAN; stdcall;
@@ -17487,7 +17487,7 @@ end;
 
 // Dynamic version of RtlAnsiCharToUnicodeChar
 function  RtlAnsiCharToUnicodeChar(
-    AnsiChar : CHAR
+    AnsiChar : AnsiChar
   ): WCHAR; stdcall;
 begin
   GetProcedureAddress(_RtlAnsiCharToUnicodeChar, ntdll, 'RtlAnsiCharToUnicodeChar');
@@ -17625,7 +17625,7 @@ procedure RtlAssert(
     FailedAssertion : PVOID;
     FileName : PVOID;
     LineNumber : ULONG;
-    Message : PCHAR
+    Message : PAnsiChar
   ); stdcall;
 begin
   GetProcedureAddress(_RtlAssert, ntdll, 'RtlAssert');
@@ -17982,7 +17982,7 @@ end;
 // Dynamic version of RtlCreateUnicodeStringFromAsciiz
 function  RtlCreateUnicodeStringFromAsciiz(
     DestinationString : PUNICODE_STRING;
-    SourceString : PCHAR
+    SourceString : PAnsiChar
   ): BOOLEAN; stdcall;
 begin
   GetProcedureAddress(_RtlCreateUnicodeStringFromAsciiz, ntdll, 'RtlCreateUnicodeStringFromAsciiz');
@@ -19188,7 +19188,7 @@ function  RtlIntegerToChar(
     Value : ULONG;
     Base : ULONG;
     Length : ULONG;
-    Str : PCHAR
+    Str : PAnsiChar
   ): NTSTATUS; stdcall;
 begin
   GetProcedureAddress(_RtlIntegerToChar, ntdll, 'RtlIntegerToChar');
@@ -19430,7 +19430,7 @@ function  RtlLargeIntegerToChar(
     Value : PLARGE_INTEGER;
     Base : ULONG;
     BufferLength : ULONG;
-    Buffer : PCHAR
+    Buffer : PAnsiChar
   ): NTSTATUS; stdcall;
 begin
   GetProcedureAddress(_RtlLargeIntegerToChar, ntdll, 'RtlLargeIntegerToChar');
@@ -19657,7 +19657,7 @@ function  RtlOemToUnicodeN(
     UnicodeString : PWSTR;
     UnicodeSize : ULONG;
     var ResultSize : ULONG;
-    OemString : PCHAR;
+    OemString : PAnsiChar;
     OemSize : ULONG
   ): NTSTATUS; stdcall;
 begin
@@ -20396,7 +20396,7 @@ end;
 
 // Dynamic version of RtlUpcaseUnicodeToMultiByteN
 function  RtlUpcaseUnicodeToMultiByteN(
-    MbString : PCHAR;
+    MbString : PAnsiChar;
     MbSize : ULONG;
     var ResultSize : ULONG;
     UnicodeString : PWSTR;
@@ -20411,7 +20411,7 @@ end;
 
 // Dynamic version of RtlUpcaseUnicodeToOemN
 function  RtlUpcaseUnicodeToOemN(
-    OemString : PCHAR;
+    OemString : PAnsiChar;
     OemSize : ULONG;
     var ResultSize : ULONG;
     UnicodeString : PWSTR;
@@ -20426,8 +20426,8 @@ end;
 
 // Dynamic version of RtlUpperChar
 function  RtlUpperChar(
-    Character : CHAR
-  ): CHAR; stdcall;
+    Character : AnsiChar
+  ): AnsiChar; stdcall;
 begin
   GetProcedureAddress(_RtlUpperChar, ntdll, 'RtlUpperChar');
   Result := TFNRtlUpperChar(_RtlUpperChar)(

packages/winunits-jedi/src/jwanb30.pas

@@ -91,19 +91,19 @@ type
     ncb_retcode: UCHAR;  // return code
     ncb_lsn: UCHAR;      // local session number
     ncb_num: UCHAR;      // number of our network name
-    ncb_buffer: PChar;   // address of message buffer
+    ncb_buffer: PAnsiChar;   // address of message buffer
     ncb_length: Word;    // size of message buffer
-    ncb_callname: array [0..NCBNAMSZ - 1] of Char; // blank-padded name of remote
-    ncb_name: array [0..NCBNAMSZ - 1] of Char;     // our blank-padded netname
+    ncb_callname: array [0..NCBNAMSZ - 1] of AnsiChar; // blank-padded name of remote
+    ncb_name: array [0..NCBNAMSZ - 1] of AnsiChar;     // our blank-padded netname
     ncb_rto: UCHAR;      // rcv timeout/retry count
     ncb_sto: UCHAR;      // send timeout/sys timeout
     ncb_post: TNcbPost;  // POST routine address
     ncb_lana_num: UCHAR; // lana (adapter) number
     ncb_cmd_cplt: UCHAR; // 0xff => commmand pending
     {$IFDEF WIN64}
-    ncb_reserve: array [0..17] of Char; // reserved, used by BIOS
+    ncb_reserve: array [0..17] of AnsiChar; // reserved, used by BIOS
     {$ELSE}
-    ncb_reserve: array [0..9] of Char;  // reserved, used by BIOS
+    ncb_reserve: array [0..9] of AnsiChar;  // reserved, used by BIOS
     {$ENDIF WIN64}
     ncb_event: HANDLE;   // HANDLE to Win32 event which
                          // will be set to the signalled
@@ -158,7 +158,7 @@ type
   PAdapterStatus = PADAPTER_STATUS;
 
   _NAME_BUFFER = record
-    name: array [0..NCBNAMSZ - 1] of Char;
+    name: array [0..NCBNAMSZ - 1] of AnsiChar;
     name_num: UCHAR;
     name_flags: UCHAR;
   end;

packages/winunits-jedi/src/jwantdsapi.pas

@@ -2953,7 +2953,7 @@ Description
 
         Whitespace trailing the last quote is discarded.
 
-        Escapes are removed and the char following the escape is kept.
+        Escapes are removed and the AnsiChar following the escape is kept.
 
     The following actions are taken when psQuotedRdnValue is unquoted:
 

packages/winunits-jedi/src/jwantdsbcli.pas

@@ -124,7 +124,7 @@ type
   BFT = WCHAR;
   {$EXTERNALSYM BFT}
   {$ELSE}
-  BFT = Char;
+  BFT = AnsiChar;
   {$EXTERNALSYM BFT}
   {$ENDIF UNICODE}
 
@@ -162,8 +162,8 @@ type
   PEDB_RSTMAPA = ^EDB_RSTMAPA;
   {$EXTERNALSYM PEDB_RSTMAPA}
   tagEDB_RSTMAPA = record
-    szDatabaseName: PChar;
-    szNewDtabaseName: PChar;
+    szDatabaseName: PAnsiChar;
+    szNewDtabaseName: PAnsiChar;
   end;
   {$EXTERNALSYM tagEDB_RSTMAPA}
   EDB_RSTMAPA = tagEDB_RSTMAPA;

packages/winunits-jedi/src/jwantquery.pas

@@ -126,8 +126,8 @@ function LocateCatalogsW(pwszScope: PWCHAR; iBmk: ULONG; pwszMachine: PWCHAR;
 // For calling from VB
 //
 
-function LocateCatalogsA(pwszScope: PCHAR; iBmk: ULONG; pwszMachine: PCHAR;
-  var pccMachine: ULONG; pwszCat: PCHAR; var pccCat: ULONG): HRESULT; stdcall;
+function LocateCatalogsA(pwszScope: PAnsiChar; iBmk: ULONG; pwszMachine: PAnsiChar;
+  var pccMachine: ULONG; pwszCat: PAnsiChar; var pccCat: ULONG): HRESULT; stdcall;
 {$EXTERNALSYM LocateCatalogsA}
 
 function LocateCatalogs(pwszScope: PTCHAR; iBmk: ULONG; pwszMachine: PTCHAR;

packages/winunits-jedi/src/jwantsecapi.pas

@@ -227,7 +227,7 @@ type
   _LSA_STRING = record
     Length: USHORT;
     MaximumLength: USHORT;
-    Buffer: PCHAR;
+    Buffer: PAnsiChar;
   end;
   {$EXTERNALSYM _LSA_STRING}
   LSA_STRING = _LSA_STRING;
@@ -2159,8 +2159,8 @@ type
     UserName: UNICODE_STRING;
     Workstation: UNICODE_STRING;
     ChallengeToClient: array [0..MSV1_0_CHALLENGE_LENGTH - 1] of UCHAR;
-    CaseSensitiveChallengeResponse: STRING;
-    CaseInsensitiveChallengeResponse: STRING;
+    CaseSensitiveChallengeResponse: _STRING;
+    CaseInsensitiveChallengeResponse: _STRING;
     ParameterControl: ULONG;
   end;
   {$EXTERNALSYM _MSV1_0_LM20_LOGON}
@@ -2181,8 +2181,8 @@ type
     UserName: UNICODE_STRING;
     Workstation: UNICODE_STRING;
     ChallengeToClient: array [0..MSV1_0_CHALLENGE_LENGTH - 1] of UCHAR;
-    AuthenticationInfo1: STRING;
-    AuthenticationInfo2: STRING;
+    AuthenticationInfo1: _STRING;
+    AuthenticationInfo2: _STRING;
     ParameterControl: ULONG;
     SubAuthPackageId: ULONG;
   end;
@@ -3205,7 +3205,7 @@ type
   _KERB_NET_ADDRESS = record
     Family: ULONG;
     Length: ULONG;
-    Address: PCHAR;
+    Address: PAnsiChar;
   end;
   {$EXTERNALSYM _KERB_NET_ADDRESS}
   KERB_NET_ADDRESS = _KERB_NET_ADDRESS;

packages/winunits-jedi/src/jwarpcasync.pas

@@ -344,9 +344,9 @@ type
     Version: Cardinal;
     Flags: Cardinal;
     ServerPrincipalNameBufferLength: Cardinal;
-    ServerPrincipalName: PChar;
+    ServerPrincipalName: PAnsiChar;
     ClientPrincipalNameBufferLength: Cardinal;
-    ClientPrincipalName: PChar;
+    ClientPrincipalName: PAnsiChar;
     AuthenticationLevel: Cardinal;
     AuthenticationService: Cardinal;
     NullSession: BOOL;

packages/winunits-jedi/src/jwarpcdce.pas

@@ -336,7 +336,7 @@ function RpcBindingInqOption(hBinding: RPC_BINDING_HANDLE; option: Cardinal;
   var pOptionValue: ULONG_PTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingInqOption}
 
-function RpcBindingFromStringBindingA(StringBinding: PChar;
+function RpcBindingFromStringBindingA(StringBinding: PAnsiChar;
   var Binding: RPC_BINDING_HANDLE): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingFromStringBindingA}
 function RpcBindingFromStringBindingW(StringBinding: PWideChar;
@@ -365,7 +365,7 @@ function RpcMgmtInqDefaultProtectLevel(AuthnSvc: Cardinal; var AuthnLevel: Cardi
 {$EXTERNALSYM RpcMgmtInqDefaultProtectLevel}
 
 function RpcBindingToStringBindingA(Binding: RPC_BINDING_HANDLE;
-  var StringBinding: PChar): RPC_STATUS; stdcall;
+  var StringBinding: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingToStringBindingA}
 function RpcBindingToStringBindingW(Binding: RPC_BINDING_HANDLE;
   var StringBinding: PWideChar): RPC_STATUS; stdcall;
@@ -378,7 +378,7 @@ function RpcBindingVectorFree(var BindingVector: PRPC_BINDING_VECTOR): RPC_STATU
 {$EXTERNALSYM RpcBindingVectorFree}
 
 function RpcStringBindingComposeA(ObjUuid, Protseq, NetworkAddr, Endpoint,
-  Options: PChar; var StringBinding: PChar): RPC_STATUS; stdcall;
+  Options: PAnsiChar; var StringBinding: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcStringBindingComposeA}
 function RpcStringBindingComposeW(ObjUuid, Protseq, NetworkAddr, Endpoint,
   Options: PWideChar; var StringBinding: PWideChar): RPC_STATUS; stdcall;
@@ -387,8 +387,8 @@ function RpcStringBindingCompose(ObjUuid, Protseq, NetworkAddr, Endpoint,
   Options: PTSTR; var StringBinding: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcStringBindingCompose}
 
-function RpcStringBindingParseA(StringBinding: PChar; ObjUuid, Protseq,
-  NetworkAddr, Endpoint, NetworkOptions: PPChar): RPC_STATUS; stdcall;
+function RpcStringBindingParseA(StringBinding: PAnsiChar; ObjUuid, Protseq,
+  NetworkAddr, Endpoint, NetworkOptions: PPAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcStringBindingParseA}
 function RpcStringBindingParseW(StringBinding: PWideChar; ObjUuid, Protseq,
   NetworkAddr, Endpoint, NetworkOptions: PPWideChar): RPC_STATUS; stdcall;
@@ -397,7 +397,7 @@ function RpcStringBindingParse(StringBinding: PTSTR; ObjUuid, Protseq,
   NetworkAddr, Endpoint, NetworkOptions: PPTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcStringBindingParse}
 
-function RpcStringFreeA(var S: PChar): RPC_STATUS; stdcall;
+function RpcStringFreeA(var S: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcStringFreeA}
 function RpcStringFreeW(var S: PWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcStringFreeW}
@@ -407,7 +407,7 @@ function RpcStringFree(var S: PTSTR): RPC_STATUS; stdcall;
 function RpcIfInqId(RpcIfHandle: RPC_IF_HANDLE; var RpcIfId: RPC_IF_ID): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcIfInqId}
 
-function RpcNetworkIsProtseqValidA(Protseq: PChar): RPC_STATUS; stdcall;
+function RpcNetworkIsProtseqValidA(Protseq: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNetworkIsProtseqValidA}
 
 function RpcNetworkIsProtseqValidW(Protseq: PWideChar): RPC_STATUS; stdcall;
@@ -491,7 +491,7 @@ function RpcServerUseAllProtseqsIfEx(MaxCalls: Cardinal; IfSpec: RPC_IF_HANDLE;
   SecurityDescriptor: Pointer; Policy: PRPC_POLICY): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseAllProtseqsIfEx}
 
-function RpcServerUseProtseqA(Protseq: PChar; MaxCalls: Cardinal;
+function RpcServerUseProtseqA(Protseq: PAnsiChar; MaxCalls: Cardinal;
   SecurityDescriptor: Pointer): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqA}
 function RpcServerUseProtseqW(Protseq: PWideChar; MaxCalls: Cardinal;
@@ -501,7 +501,7 @@ function RpcServerUseProtseq(Protseq: PTSTR; MaxCalls: Cardinal;
   SecurityDescriptor: Pointer): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseq}
 
-function RpcServerUseProtseqExA(Protseq: PChar; MaxCalls: Cardinal;
+function RpcServerUseProtseqExA(Protseq: PAnsiChar; MaxCalls: Cardinal;
   SecurityDescriptor: Pointer; const Policy: RPC_POLICY): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqExA}
 function RpcServerUseProtseqExW(Protseq: PWideChar; MaxCalls: Cardinal;
@@ -511,8 +511,8 @@ function RpcServerUseProtseqEx(Protseq: PTSTR; MaxCalls: Cardinal;
   SecurityDescriptor: Pointer; const Policy: RPC_POLICY): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqEx}
 
-function RpcServerUseProtseqEpA(Protseq: PChar; MaxCalls: Cardinal;
-  Endpoint: PChar; SecurityDescriptor: Pointer): RPC_STATUS; stdcall;
+function RpcServerUseProtseqEpA(Protseq: PAnsiChar; MaxCalls: Cardinal;
+  Endpoint: PAnsiChar; SecurityDescriptor: Pointer): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqEpA}
 function RpcServerUseProtseqEpW(Protseq: PWideChar; MaxCalls: Cardinal;
   Endpoint: PWideChar; SecurityDescriptor: Pointer): RPC_STATUS; stdcall;
@@ -521,8 +521,8 @@ function RpcServerUseProtseqEp(Protseq: PTSTR; MaxCalls: Cardinal;
   Endpoint: PTSTR; SecurityDescriptor: Pointer): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqEp}
 
-function RpcServerUseProtseqEpExA(Protseq: PChar; MaxCalls: Cardinal;
-  Endpoint: PChar; SecurityDescriptor: Pointer; const Policy: RPC_POLICY): RPC_STATUS; stdcall;
+function RpcServerUseProtseqEpExA(Protseq: PAnsiChar; MaxCalls: Cardinal;
+  Endpoint: PAnsiChar; SecurityDescriptor: Pointer; const Policy: RPC_POLICY): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqEpExA}
 function RpcServerUseProtseqEpExW(Protseq: PWideChar; MaxCalls: Cardinal;
   Endpoint: PWideChar; SecurityDescriptor: Pointer; const Policy: RPC_POLICY): RPC_STATUS; stdcall;
@@ -531,14 +531,14 @@ function RpcServerUseProtseqEpEx(Protseq: PTSTR; MaxCalls: Cardinal;
   Endpoint: PTSTR; SecurityDescriptor: Pointer; const Policy: RPC_POLICY): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqEpEx}
 
-function RpcServerUseProtseqIfA(Protseq: PChar; MaxCalls: Cardinal;
+function RpcServerUseProtseqIfA(Protseq: PAnsiChar; MaxCalls: Cardinal;
   IfSpec: RPC_IF_HANDLE; SecurityDescriptor: Pointer): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqIfA}
 function RpcServerUseProtseqIfW(Protseq: PWideChar; MaxCalls: Cardinal;
   IfSpec: RPC_IF_HANDLE; SecurityDescriptor: Pointer): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqIfW}
 
-function RpcServerUseProtseqIfExA(Protseq: PChar; MaxCalls: Cardinal;
+function RpcServerUseProtseqIfExA(Protseq: PAnsiChar; MaxCalls: Cardinal;
   IfSpec: RPC_IF_HANDLE; SecurityDescriptor: Pointer; const Policy: RPC_POLICY): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerUseProtseqIfExA}
 function RpcServerUseProtseqIfExW(Protseq: PWideChar; MaxCalls: Cardinal;
@@ -583,7 +583,7 @@ function RpcIfIdVectorFree(var IfIdVector: PRPC_IF_ID_VECTOR): RPC_STATUS; stdca
 {$EXTERNALSYM RpcIfIdVectorFree}
 
 function RpcMgmtInqServerPrincNameA(Binding: RPC_BINDING_HANDLE;
-  AuthnSvc: Cardinal; var ServerPrincName: PChar): RPC_STATUS; stdcall;
+  AuthnSvc: Cardinal; var ServerPrincName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcMgmtInqServerPrincNameA}
 function RpcMgmtInqServerPrincNameW(Binding: RPC_BINDING_HANDLE;
   AuthnSvc: Cardinal; var ServerPrincName: PWideChar): RPC_STATUS; stdcall;
@@ -592,7 +592,7 @@ function RpcMgmtInqServerPrincName(Binding: RPC_BINDING_HANDLE;
   AuthnSvc: Cardinal; var ServerPrincName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcMgmtInqServerPrincName}
 
-function RpcServerInqDefaultPrincNameA(AuthnSvc: Cardinal; var PrincName: PChar): RPC_STATUS; stdcall;
+function RpcServerInqDefaultPrincNameA(AuthnSvc: Cardinal; var PrincName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerInqDefaultPrincNameA}
 function RpcServerInqDefaultPrincNameW(AuthnSvc: Cardinal; var PrincName: PWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerInqDefaultPrincNameW}
@@ -603,7 +603,7 @@ function RpcEpResolveBinding(Binding: RPC_BINDING_HANDLE; IfSpe: RPC_IF_HANDLE):
 {$EXTERNALSYM RpcEpResolveBinding}
 
 function RpcNsBindingInqEntryNameA(Binding: RPC_BINDING_HANDLE;
-  EntryNameSyntax: Cardinal; var EntryName: PChar): RPC_STATUS; stdcall;
+  EntryNameSyntax: Cardinal; var EntryName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingInqEntryNameA}
 function RpcNsBindingInqEntryNameW(Binding: RPC_BINDING_HANDLE;
   EntryNameSyntax: Cardinal; var EntryName: PWideChar): RPC_STATUS; stdcall;
@@ -760,11 +760,11 @@ type
   PSecWinNTAuthIdentityW = PSEC_WINNT_AUTH_IDENTITY_W;
 
   _SEC_WINNT_AUTH_IDENTITY_A = record
-    User: PChar;
+    User: PAnsiChar;
     UserLength: Longint;
-    Domain: PChar;
+    Domain: PAnsiChar;
     DomainLength: Longint;
-    Password: PChar;
+    Password: PAnsiChar;
     PasswordLength: Longint;
     Flags: Longint;
   end;
@@ -1025,7 +1025,7 @@ function RpcRevertToSelf: RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcRevertToSelf}
 
 function RpcBindingInqAuthClientA(ClientBinding: RPC_BINDING_HANDLE;
-  Privs: PRPC_AUTHZ_HANDLE; ServerPrincName: PPChar; AuthnLevel, AuthnSvc,
+  Privs: PRPC_AUTHZ_HANDLE; ServerPrincName: PPAnsiChar; AuthnLevel, AuthnSvc,
   AuthzSvc: PCardinal): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingInqAuthClientA}
 function RpcBindingInqAuthClientW(ClientBinding: RPC_BINDING_HANDLE;
@@ -1034,7 +1034,7 @@ function RpcBindingInqAuthClientW(ClientBinding: RPC_BINDING_HANDLE;
 {$EXTERNALSYM RpcBindingInqAuthClientW}
 
 function RpcBindingInqAuthClientExA(ClientBinding: RPC_BINDING_HANDLE;
-  Privs: PRPC_AUTHZ_HANDLE; ServerPrincName: PPChar; AuthnLevel, AuthnSvc,
+  Privs: PRPC_AUTHZ_HANDLE; ServerPrincName: PPAnsiChar; AuthnLevel, AuthnSvc,
   AuthzSvc: PCardinal; Flags: Cardinal): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingInqAuthClientExA}
 function RpcBindingInqAuthClientExW(ClientBinding: RPC_BINDING_HANDLE;
@@ -1042,7 +1042,7 @@ function RpcBindingInqAuthClientExW(ClientBinding: RPC_BINDING_HANDLE;
   AuthzSvc: PCardinal; Flags: Cardinal): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingInqAuthClientExW}
 
-function RpcBindingInqAuthInfoA(Binding: RPC_BINDING_HANDLE; ServerPrincName: PPChar;
+function RpcBindingInqAuthInfoA(Binding: RPC_BINDING_HANDLE; ServerPrincName: PPAnsiChar;
   AuthnLevel, AuthnSvc: PCardinal; AuthIdentity: PRPC_AUTH_IDENTITY_HANDLE;
   AuthzSvc: PCardinal): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingInqAuthInfoA}
@@ -1051,7 +1051,7 @@ function RpcBindingInqAuthInfoW(Binding: RPC_BINDING_HANDLE; ServerPrincName: PP
   AuthzSvc: PCardinal): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingInqAuthInfoW}
 
-function RpcBindingSetAuthInfoA(Binding: RPC_BINDING_HANDLE; ServerPrincName: PChar;
+function RpcBindingSetAuthInfoA(Binding: RPC_BINDING_HANDLE; ServerPrincName: PAnsiChar;
   AuthnLevel, AuthnSvc: Cardinal; AuthIdentity: RPC_AUTH_IDENTITY_HANDLE;
   AuthzSvc: Cardinal): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingSetAuthInfoA}
@@ -1061,7 +1061,7 @@ function RpcBindingSetAuthInfoW(Binding: RPC_BINDING_HANDLE; ServerPrincName: PW
 {$EXTERNALSYM RpcBindingSetAuthInfoW}
 
 function RpcBindingSetAuthInfoExA(Binding: RPC_BINDING_HANDLE;
-  ServerPrincName: PChar; AuthnLevel, AuthnSvc: Cardinal;
+  ServerPrincName: PAnsiChar; AuthnLevel, AuthnSvc: Cardinal;
   AuthIdentity: RPC_AUTH_IDENTITY_HANDLE; AuthzSvc: Cardinal;
   const SecurityQOS: RPC_SECURITY_QOS): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingSetAuthInfoExA}
@@ -1072,7 +1072,7 @@ function RpcBindingSetAuthInfoExW(Binding: RPC_BINDING_HANDLE;
 {$EXTERNALSYM RpcBindingSetAuthInfoExW}
 
 function RpcBindingInqAuthInfoExA(Binding: RPC_BINDING_HANDLE;
-  ServerPrincName: PPChar; AuthnLevel, AuthnSvc: PCardinal;
+  ServerPrincName: PPAnsiChar; AuthnLevel, AuthnSvc: PCardinal;
   AuthIdentity: PRPC_AUTH_IDENTITY_HANDLE; AuthzSvc: PCardinal;
   RpcQosVersion: Cardinal; var SecurityQOS: RPC_SECURITY_QOS): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcBindingInqAuthInfoExA}
@@ -1088,7 +1088,7 @@ type
   {$EXTERNALSYM RPC_AUTH_KEY_RETRIEVAL_FN}
   TRpcAuthKeyRetrievalFn = RPC_AUTH_KEY_RETRIEVAL_FN;
 
-function RpcServerRegisterAuthInfoA(ServerPrincName: PChar; AuthnSvc: Cardinal;
+function RpcServerRegisterAuthInfoA(ServerPrincName: PAnsiChar; AuthnSvc: Cardinal;
   GetKeyFn: RPC_AUTH_KEY_RETRIEVAL_FN; Arg: Pointer): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcServerRegisterAuthInfoA}
 function RpcServerRegisterAuthInfoW(ServerPrincName: PWideChar; AuthnSvc: Cardinal;
@@ -1126,8 +1126,8 @@ function RpcServerRegisterAuthInfo(ServerPrincName: PTSTR; AuthnSvc: Cardinal;
 
 type
   RPC_CLIENT_INFORMATION1 = record
-    UserName: PChar;
-    ComputerName: PChar;
+    UserName: PAnsiChar;
+    ComputerName: PAnsiChar;
     Privilege: Word;
     AuthFlags: Longword;
   end;
@@ -1162,14 +1162,14 @@ function UuidCreate(var Uuid: UUID): RPC_STATUS; stdcall;
 function UuidCreateSequential(out Uuid: UUID): RPC_STATUS; stdcall;
 {$EXTERNALSYM UuidCreateSequential}
 
-function UuidFromStringA(StringUuid: PChar; var Uuid: UUID): RPC_STATUS; stdcall;
+function UuidFromStringA(StringUuid: PAnsiChar; var Uuid: UUID): RPC_STATUS; stdcall;
 {$EXTERNALSYM UuidFromStringA}
 function UuidFromStringW(StringUuid: PWideChar; var Uuid: UUID): RPC_STATUS; stdcall;
 {$EXTERNALSYM UuidFromStringW}
 function UuidFromString(StringUuid: PTSTR; var Uuid: UUID): RPC_STATUS; stdcall;
 {$EXTERNALSYM UuidFromString}
 
-function UuidToStringA(const Uuid: UUID; var StringUuid: PChar): RPC_STATUS; stdcall;
+function UuidToStringA(const Uuid: UUID; var StringUuid: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM UuidToStringA}
 function UuidToStringW(const Uuid: UUID; var StringUuid: PWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM UuidToStringW}
@@ -1193,7 +1193,7 @@ function UuidIsNil(const Uuid: UUID; var Status: RPC_STATUS): Integer; stdcall;
 
 function RpcEpRegisterNoReplaceA(IfSpec: RPC_IF_HANDLE;
   BindingVector: PRPC_BINDING_VECTOR; UuidVector: PUUID_VECTOR;
-  Annotation: PChar): RPC_STATUS; stdcall;
+  Annotation: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcEpRegisterNoReplaceA}
 function RpcEpRegisterNoReplaceW(IfSpec: RPC_IF_HANDLE;
   BindingVector: PRPC_BINDING_VECTOR; UuidVector: PUUID_VECTOR;
@@ -1205,7 +1205,7 @@ function RpcEpRegisterNoReplace(IfSpec: RPC_IF_HANDLE;
 {$EXTERNALSYM RpcEpRegisterNoReplace}
 
 function RpcEpRegisterA(IfSpec: RPC_IF_HANDLE; BindingVector: PRPC_BINDING_VECTOR;
-  UuidVector: PUUID_VECTOR; Annotation: PChar): RPC_STATUS; stdcall;
+  UuidVector: PUUID_VECTOR; Annotation: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcEpRegisterA}
 function RpcEpRegisterW(IfSpec: RPC_IF_HANDLE; BindingVector: PRPC_BINDING_VECTOR;
   UuidVector: PUUID_VECTOR; Annotation: PWideChar): RPC_STATUS; stdcall;
@@ -1219,7 +1219,7 @@ function RpcEpUnregister(IfSpec: RPC_IF_HANDLE; BindingVector: PRPC_BINDING_VECT
   UuidVector: UUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcEpUnregister}
 
-function DceErrorInqTextA(RpcStatus: RPC_STATUS; ErrorText: PChar): RPC_STATUS; stdcall;
+function DceErrorInqTextA(RpcStatus: RPC_STATUS; ErrorText: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM DceErrorInqTextA}
 function DceErrorInqTextW(RpcStatus: RPC_STATUS; ErrorText: PWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM DceErrorInqTextW}
@@ -1264,7 +1264,7 @@ function RpcMgmtEpEltInqDone(var InquiryContext: RPC_EP_INQ_HANDLE): RPC_STATUS;
 {$EXTERNALSYM RpcMgmtEpEltInqDone}
 
 function RpcMgmtEpEltInqNextA(InquiryContext: RPC_EP_INQ_HANDLE; var IfId: RPC_IF_ID;
-  Binding: PRPC_BINDING_HANDLE; ObjectUuid: PUUID; var Annotation: PChar): RPC_STATUS; stdcall;
+  Binding: PRPC_BINDING_HANDLE; ObjectUuid: PUUID; var Annotation: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcMgmtEpEltInqNextA}
 function RpcMgmtEpEltInqNextW(InquiryContext: RPC_EP_INQ_HANDLE; var IfId: RPC_IF_ID;
   Binding: PRPC_BINDING_HANDLE; ObjectUuid: PUUID; var Annotation: PWideChar): RPC_STATUS; stdcall;

packages/winunits-jedi/src/jwarpcnsi.pas

@@ -90,7 +90,7 @@ const
 
 // Server APIs
 
-function RpcNsBindingExportA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsBindingExportA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   IfSpec: RPC_IF_HANDLE; BindingVec: PRPC_BINDING_VECTOR;
   ObjectUuidVec: PUUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingExportA}
@@ -103,7 +103,7 @@ function RpcNsBindingExport(EntryNameSyntax: Longword; EntryName: PTSTR;
   ObjectUuidVec: PUUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingExport}
 
-function RpcNsBindingUnexportA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsBindingUnexportA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   IfSpec: RPC_IF_HANDLE; ObjectUuidVec: PUUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingUnexportA}
 function RpcNsBindingUnexportW(EntryNameSyntax: Longword; EntryName: PWideChar;
@@ -115,7 +115,7 @@ function RpcNsBindingUnexport(EntryNameSyntax: Longword; EntryName: PTSTR;
 
 // Server PnP APIs
 
-function RpcNsBindingExportPnPA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsBindingExportPnPA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   IfSpec: RPC_IF_HANDLE; ObjectVector: PUUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingExportPnPA}
 function RpcNsBindingExportPnPW(EntryNameSyntax: Longword; EntryName: PWideChar;
@@ -125,7 +125,7 @@ function RpcNsBindingExportPnP(EntryNameSyntax: Longword; EntryName: PTSTR;
   IfSpec: RPC_IF_HANDLE; ObjectVector: PUUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingExportPnP}
 
-function RpcNsBindingUnexportPnPA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsBindingUnexportPnPA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   IfSpec: RPC_IF_HANDLE; ObjectVector: PUUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingUnexportPnPA}
 function RpcNsBindingUnexportPnPW(EntryNameSyntax: Longword; EntryName: PWideChar;
@@ -137,7 +137,7 @@ function RpcNsBindingUnexportPnP(EntryNameSyntax: Longword; EntryName: PTSTR;
 
 // Client APIs
 
-function RpcNsBindingLookupBeginA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsBindingLookupBeginA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   IfSpec: RPC_IF_HANDLE; ObjUuid: PUUID; BindingMaxCount: Longword;
   var LookupContext: RPC_NS_HANDLE): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingLookupBeginA}
@@ -159,15 +159,15 @@ function RpcNsBindingLookupDone(var LookupContext: RPC_NS_HANDLE): RPC_STATUS; s
 
 // Group APIs
 
-function RpcNsGroupDeleteA(GroupNameSyntax: Longword; GroupName: PChar): RPC_STATUS; stdcall;
+function RpcNsGroupDeleteA(GroupNameSyntax: Longword; GroupName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupDeleteA}
 function RpcNsGroupDeleteW(GroupNameSyntax: Longword; GroupName: PWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupDeleteW}
 function RpcNsGroupDelete(GroupNameSyntax: Longword; GroupName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupDelete}
 
-function RpcNsGroupMbrAddA(GroupNameSyntax: Longword; GroupName: PChar;
-  MemberNameSyntax: Longword; MemberName: PChar): RPC_STATUS; stdcall;
+function RpcNsGroupMbrAddA(GroupNameSyntax: Longword; GroupName: PAnsiChar;
+  MemberNameSyntax: Longword; MemberName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupMbrAddA}
 function RpcNsGroupMbrAddW(GroupNameSyntax: Longword; GroupName: PWideChar;
   MemberNameSyntax: Longword; MemberName: PWideChar): RPC_STATUS; stdcall;
@@ -176,8 +176,8 @@ function RpcNsGroupMbrAdd(GroupNameSyntax: Longword; GroupName: PTSTR;
   MemberNameSyntax: Longword; MemberName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupMbrAdd}
 
-function RpcNsGroupMbrRemoveA(GroupNameSyntax: Longword; GroupName: PChar;
-  MemberNameSyntax: Longword; MemberName: PChar): RPC_STATUS; stdcall;
+function RpcNsGroupMbrRemoveA(GroupNameSyntax: Longword; GroupName: PAnsiChar;
+  MemberNameSyntax: Longword; MemberName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupMbrRemoveA}
 function RpcNsGroupMbrRemoveW(GroupNameSyntax: Longword; GroupName: PWideChar;
   MemberNameSyntax: Longword; MemberName: PWideChar): RPC_STATUS; stdcall;
@@ -186,7 +186,7 @@ function RpcNsGroupMbrRemove(GroupNameSyntax: Longword; GroupName: PTSTR;
   MemberNameSyntax: Longword; MemberName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupMbrRemove}
 
-function RpcNsGroupMbrInqBeginA(GroupNameSyntax: Longword; GroupName: PChar;
+function RpcNsGroupMbrInqBeginA(GroupNameSyntax: Longword; GroupName: PAnsiChar;
   MemberNameSyntax: Longword; var InquiryContext: RPC_NS_HANDLE): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupMbrInqBeginA}
 function RpcNsGroupMbrInqBeginW(GroupNameSyntax: Longword; GroupName: PWideChar;
@@ -196,7 +196,7 @@ function RpcNsGroupMbrInqBegin(GroupNameSyntax: Longword; GroupName: PTSTR;
   MemberNameSyntax: Longword; var InquiryContext: RPC_NS_HANDLE): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupMbrInqBegin}
 
-function RpcNsGroupMbrInqNextA(InquiryContext: RPC_NS_HANDLE; MemberName: PPChar): RPC_STATUS; stdcall;
+function RpcNsGroupMbrInqNextA(InquiryContext: RPC_NS_HANDLE; MemberName: PPAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupMbrInqNextA}
 function RpcNsGroupMbrInqNextW(InquiryContext: RPC_NS_HANDLE; MemberName: PPWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsGroupMbrInqNextW}
@@ -208,16 +208,16 @@ function RpcNsGroupMbrInqDone(var InquiryContext: RPC_NS_HANDLE): RPC_STATUS; st
 
 // Profile APIs
 
-function RpcNsProfileDeleteA(ProfileNameSyntax: Longword; ProfileName: PChar): RPC_STATUS; stdcall;
+function RpcNsProfileDeleteA(ProfileNameSyntax: Longword; ProfileName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileDeleteA}
 function RpcNsProfileDeleteW(ProfileNameSyntax: Longword; ProfileName: PWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileDeleteW}
 function RpcNsProfileDelete(ProfileNameSyntax: Longword; ProfileName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileDelete}
 
-function RpcNsProfileEltAddA(ProfileNameSyntax: Longword; ProfileName: PChar;
-  IfId: PRPC_IF_ID; MemberNameSyntax: Longword; MemberName: PChar;
-  Priority: Longword; Annotation: PChar): RPC_STATUS; stdcall;
+function RpcNsProfileEltAddA(ProfileNameSyntax: Longword; ProfileName: PAnsiChar;
+  IfId: PRPC_IF_ID; MemberNameSyntax: Longword; MemberName: PAnsiChar;
+  Priority: Longword; Annotation: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileEltAddA}
 function RpcNsProfileEltAddW(ProfileNameSyntax: Longword; ProfileName: PWideChar;
   IfId: PRPC_IF_ID; MemberNameSyntax: Longword; MemberName: PWideChar;
@@ -228,8 +228,8 @@ function RpcNsProfileEltAdd(ProfileNameSyntax: Longword; ProfileName: PTSTR;
   Priority: Longword; Annotation: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileEltAdd}
 
-function RpcNsProfileEltRemoveA(ProfileNameSyntax: Longword; ProfileName: PChar;
-  IfId: PRPC_IF_ID; MemberNameSyntax: Longword; MemberName: PChar): RPC_STATUS; stdcall;
+function RpcNsProfileEltRemoveA(ProfileNameSyntax: Longword; ProfileName: PAnsiChar;
+  IfId: PRPC_IF_ID; MemberNameSyntax: Longword; MemberName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileEltRemoveA}
 function RpcNsProfileEltRemoveW(ProfileNameSyntax: Longword; ProfileName: PWideChar;
   IfId: PRPC_IF_ID; MemberNameSyntax: Longword; MemberName: PWideChar): RPC_STATUS; stdcall;
@@ -238,9 +238,9 @@ function RpcNsProfileEltRemove(ProfileNameSyntax: Longword; ProfileName: PTSTR;
   IfId: PRPC_IF_ID; MemberNameSyntax: Longword; MemberName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileEltRemove}
 
-function RpcNsProfileEltInqBeginA(ProfileNameSyntax: Longword; ProfileName: PChar;
+function RpcNsProfileEltInqBeginA(ProfileNameSyntax: Longword; ProfileName: PAnsiChar;
   InquiryType: Longword; IfId: PRPC_IF_ID; VersOption, MemberNameSyntax: Longword;
-  MemberName: PChar; var InquiryContext: RPC_NS_HANDLE): RPC_STATUS; stdcall;
+  MemberName: PAnsiChar; var InquiryContext: RPC_NS_HANDLE): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileEltInqBeginA}
 function RpcNsProfileEltInqBeginW(ProfileNameSyntax: Longword; ProfileName: PWideChar;
   InquiryType: Longword; IfId: PRPC_IF_ID; VersOption, MemberNameSyntax: Longword;
@@ -252,7 +252,7 @@ function RpcNsProfileEltInqBegin(ProfileNameSyntax: Longword; ProfileName: PTSTR
 {$EXTERNALSYM RpcNsProfileEltInqBegin}
 
 function RpcNsProfileEltInqNextA(InquiryContext: RPC_NS_HANDLE; var IfId: RPC_IF_ID;
-  MemberName: PPChar; var Priority: Longword; Annotation: PPChar): RPC_STATUS; stdcall;
+  MemberName: PPAnsiChar; var Priority: Longword; Annotation: PPAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsProfileEltInqNextA}
 function RpcNsProfileEltInqNextW(InquiryContext: RPC_NS_HANDLE; var IfId: RPC_IF_ID;
   MemberName: PPWideChar; var Priority: Longword; Annotation: PPWideChar): RPC_STATUS; stdcall;
@@ -266,7 +266,7 @@ function RpcNsProfileEltInqDone(var InquiryContext: RPC_NS_HANDLE): RPC_STATUS;
 
 // Entry object APIs
 
-function RpcNsEntryObjectInqBeginA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsEntryObjectInqBeginA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   var InquiryContext: RPC_NS_HANDLE): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsEntryObjectInqBeginA}
 function RpcNsEntryObjectInqBeginW(EntryNameSyntax: Longword; EntryName: PWideChar;
@@ -284,8 +284,8 @@ function RpcNsEntryObjectInqDone(var InquiryContext: RPC_NS_HANDLE): RPC_STATUS;
 
 // Management and MISC APIs
 
-function RpcNsEntryExpandNameA(EntryNameSyntax: Longword; EntryName: PChar;
-  var ExpandedName: PChar): RPC_STATUS; stdcall;
+function RpcNsEntryExpandNameA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
+  var ExpandedName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsEntryExpandNameA}
 function RpcNsEntryExpandNameW(EntryNameSyntax: Longword; EntryName: PWideChar;
   var ExpandedName: PWideChar): RPC_STATUS; stdcall;
@@ -294,7 +294,7 @@ function RpcNsEntryExpandName(EntryNameSyntax: Longword; EntryName: PTSTR;
   var ExpandedName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsEntryExpandName}
 
-function RpcNsMgmtBindingUnexportA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsMgmtBindingUnexportA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   IfId: PRPC_IF_ID; VersOption: Longword; ObjectUuidVec: PUUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtBindingUnexportA}
 function RpcNsMgmtBindingUnexportW(EntryNameSyntax: Longword; EntryName: PWideChar;
@@ -304,21 +304,21 @@ function RpcNsMgmtBindingUnexport(EntryNameSyntax: Longword; EntryName: PTSTR;
   IfId: PRPC_IF_ID; VersOption: Longword; ObjectUuidVec: PUUID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtBindingUnexport}
 
-function RpcNsMgmtEntryCreateA(EntryNameSyntax: Longword; EntryName: PChar): RPC_STATUS; stdcall;
+function RpcNsMgmtEntryCreateA(EntryNameSyntax: Longword; EntryName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtEntryCreateA}
 function RpcNsMgmtEntryCreateW(EntryNameSyntax: Longword; EntryName: PWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtEntryCreateW}
 function RpcNsMgmtEntryCreate(EntryNameSyntax: Longword; EntryName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtEntryCreate}
 
-function RpcNsMgmtEntryDeleteA(EntryNameSyntax: Longword; EntryName: PChar): RPC_STATUS; stdcall;
+function RpcNsMgmtEntryDeleteA(EntryNameSyntax: Longword; EntryName: PAnsiChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtEntryDeleteA}
 function RpcNsMgmtEntryDeleteW(EntryNameSyntax: Longword; EntryName: PWideChar): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtEntryDeleteW}
 function RpcNsMgmtEntryDelete(EntryNameSyntax: Longword; EntryName: PTSTR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtEntryDelete}
 
-function RpcNsMgmtEntryInqIfIdsA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsMgmtEntryInqIfIdsA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   var IfIdVec: PRPC_IF_ID_VECTOR): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsMgmtEntryInqIfIdsA}
 function RpcNsMgmtEntryInqIfIdsW(EntryNameSyntax: Longword; EntryName: PWideChar;
@@ -340,7 +340,7 @@ function RpcNsMgmtSetExpAge(ExpirationAge: Longword): RPC_STATUS; stdcall;
 
 // Client API's implemented in wrappers.
 
-function RpcNsBindingImportBeginA(EntryNameSyntax: Longword; EntryName: PChar;
+function RpcNsBindingImportBeginA(EntryNameSyntax: Longword; EntryName: PAnsiChar;
   IfSpec: RPC_IF_HANDLE; ObjUuid: PUUID; var ImportContext: RPC_NS_HANDLE): RPC_STATUS; stdcall;
 {$EXTERNALSYM RpcNsBindingImportBeginA}
 function RpcNsBindingImportBeginW(EntryNameSyntax: Longword; EntryName: PWideChar;

packages/winunits-jedi/src/jwasnmp.pas

@@ -64,7 +64,7 @@ uses
 type
   PAsnOctetString = ^TAsnOctetString;
   TAsnOctetString = record
-    stream: PChar;
+    stream: PAnsiChar;
     length: UINT;
     dynamic_: BOOL;
   end;

packages/winunits-jedi/src/jwasrrestoreptapi.pas

@@ -140,7 +140,7 @@ type
     dwEventType: DWORD;                // Type of Event - Begin or End
     dwRestorePtType: DWORD;            // Type of Restore Point - App install/uninstall
     llSequenceNumber: Int64;           // Sequence Number - 0 for begin
-    szDescription: array [0..MAX_DESC - 1] of Char;    // Description - Name of Application / Operation
+    szDescription: array [0..MAX_DESC - 1] of AnsiChar;    // Description - Name of Application / Operation
   end;
   {$EXTERNALSYM _RESTOREPTINFOA}
   RESTOREPOINTINFOA = _RESTOREPTINFOA;

packages/winunits-jedi/src/jwasspi.pas

@@ -90,7 +90,7 @@ type
   PSecWChar = ^TSecWChar;
   TSecWChar = SEC_WCHAR;
 
-  SEC_CHAR = CHAR;
+  SEC_CHAR = AnsiChar;
   {$EXTERNALSYM SEC_CHAR}
   PSEC_CHAR = ^SEC_CHAR;
   {$NODEFINE PSEC_CHAR}
@@ -1158,7 +1158,7 @@ type
 
   _SecPkgContext_AuthzID = record
     AuthzIDLength: Cardinal;
-    AuthzID: PChar;
+    AuthzID: PAnsiChar;
   end;
   {$EXTERNALSYM _SecPkgContext_AuthzID}
   SecPkgContext_AuthzID = _SecPkgContext_AuthzID;
@@ -1170,7 +1170,7 @@ type
 
   _SecPkgContext_Target = record
     TargetLength: Cardinal;
-    Target: PChar;
+    Target: PAnsiChar;
   end;
   {$EXTERNALSYM _SecPkgContext_Target}
   SecPkgContext_Target = _SecPkgContext_Target;
@@ -2135,11 +2135,11 @@ type
   PSecWinNTAuthIdentityW = PSEC_WINNT_AUTH_IDENTITY_W;
 
   _SEC_WINNT_AUTH_IDENTITY_A = record
-    User: PChar;
+    User: PAnsiChar;
     UserLength: Cardinal;
-    Domain: PChar;
+    Domain: PAnsiChar;
     DomainLength: Cardinal;
-    Password: PChar;
+    Password: PAnsiChar;
     PasswordLength: Cardinal;
     Flags: Cardinal;
   end;
@@ -2204,14 +2204,14 @@ type
   _SEC_WINNT_AUTH_IDENTITY_EXA = record
     Version: Cardinal;
     Length: Cardinal;
-    User: PChar;
+    User: PAnsiChar;
     UserLength: Cardinal;
-    Domain: PChar;
+    Domain: PAnsiChar;
     DomainLength: Cardinal;
-    Password: PChar;
+    Password: PAnsiChar;
     PasswordLength: Cardinal;
     Flags: Cardinal;
-    PackageList: PChar;
+    PackageList: PAnsiChar;
     PackageListLength: Cardinal;
   end;
   {$EXTERNALSYM _SEC_WINNT_AUTH_IDENTITY_EXA}

packages/winunits-jedi/src/jwasubauth.pas

@@ -245,7 +245,7 @@ type
   PCLEAR_BLOCK = ^CLEAR_BLOCK;
   {$EXTERNALSYM PCLEAR_BLOCK}
   _CLEAR_BLOCK = record
-    data: array [0..CLEAR_BLOCK_LENGTH - 1] of CHAR;
+    data: array [0..CLEAR_BLOCK_LENGTH - 1] of AnsiChar;
   end;
   {$EXTERNALSYM _CLEAR_BLOCK}
   CLEAR_BLOCK = _CLEAR_BLOCK;
@@ -261,7 +261,7 @@ type
   PCYPHER_BLOCK = ^CYPHER_BLOCK;
   {$EXTERNALSYM PCYPHER_BLOCK}
   _CYPHER_BLOCK = record
-    data: array [0..CYPHER_BLOCK_LENGTH - 1] of CHAR;
+    data: array [0..CYPHER_BLOCK_LENGTH - 1] of AnsiChar;
   end;
   {$EXTERNALSYM _CYPHER_BLOCK}
   CYPHER_BLOCK = _CYPHER_BLOCK;
@@ -368,8 +368,8 @@ type
   _NETLOGON_NETWORK_INFO = record
     Identity: NETLOGON_LOGON_IDENTITY_INFO;
     LmChallenge: LM_CHALLENGE;
-    NtChallengeResponse: STRING;
-    LmChallengeResponse: STRING;
+    NtChallengeResponse: _STRING;
+    LmChallengeResponse: _STRING;
   end;
   {$EXTERNALSYM _NETLOGON_NETWORK_INFO}
   NETLOGON_NETWORK_INFO = _NETLOGON_NETWORK_INFO;

packages/winunits-jedi/src/jwatlhelp32.pas

@@ -235,7 +235,7 @@ type
     th32ParentProcessID: DWORD;    // this process's parent process
     pcPriClassBase: LONG;          // Base priority of process's threads
     dwFlags: DWORD;
-    szExeFile: array [0..MAX_PATH - 1] of Char;    // Path
+    szExeFile: array [0..MAX_PATH - 1] of AnsiChar;    // Path
   end;
   {$EXTERNALSYM tagPROCESSENTRY32}
   PROCESSENTRY32 = tagPROCESSENTRY32;
@@ -329,8 +329,8 @@ type
     modBaseAddr: LPBYTE;       // Base address of module in th32ProcessID's context
     modBaseSize: DWORD;        // Size in bytes of module starting at modBaseAddr
     hModule: HMODULE;          // The hModule of this module in th32ProcessID's context
-    szModule: array [0..MAX_MODULE_NAME32] of Char;
-    szExePath: array [0..MAX_PATH - 1] of Char;
+    szModule: array [0..MAX_MODULE_NAME32] of AnsiChar;
+    szExePath: array [0..MAX_PATH - 1] of AnsiChar;
   end;
   {$EXTERNALSYM tagMODULEENTRY32}
   MODULEENTRY32 = tagMODULEENTRY32;

packages/winunits-jedi/src/jwauserenv.pas

@@ -645,7 +645,7 @@ type
     lpDSPath: LPSTR;              // Path to the Active Directory portion of the GPO
     lpFileSysPath: LPSTR;         // Path to the file system portion of the GPO
     lpDisplayName: LPSTR;         // Friendly display name
-    szGPOName: array [0..49] of CHAR; // Unique name
+    szGPOName: array [0..49] of AnsiChar; // Unique name
     GPOLink: GPO_LINK;            // Link information
     lParam: LPARAM;               // Free space for the caller to store GPO specific information
     pNext: PGROUP_POLICY_OBJECTA; // Next GPO in the list

packages/winunits-jedi/src/jwawbemcli.pas

@@ -1294,8 +1294,8 @@ const
 // Additional Prototypes for ALL interfaces
 
 //unsigned long             __RPC_USER  WideString_UserSize(     unsigned long *, unsigned long            , WideString * );
-//unsigned char * __RPC_USER  WideString_UserMarshal(  unsigned long *, unsigned char *, WideString * );
-//unsigned char * __RPC_USER  WideString_UserUnmarshal(unsigned long *, unsigned char *, WideString * );
+//unsigned AnsiChar * __RPC_USER  WideString_UserMarshal(  unsigned long *, unsigned AnsiChar *, WideString * );
+//unsigned AnsiChar * __RPC_USER  WideString_UserUnmarshal(unsigned long *, unsigned AnsiChar *, WideString * );
 //void                      __RPC_USER  WideString_UserFree(     unsigned long *, WideString * );
 
 // end of Additional Prototypes

packages/winunits-jedi/src/jwawinbase.pas

@@ -745,11 +745,11 @@ type
     ByteSize: BYTE;        // Number of bits/byte, 4-8
     Parity: BYTE;          // 0-4=None,Odd,Even,Mark,Space
     StopBits: BYTE;        // 0,1,2 = 1, 1.5, 2
-    XonChar: Char;         // Tx and Rx X-ON character
-    XoffChar: Char;        // Tx and Rx X-OFF character
-    ErrorChar: Char;       // Error replacement char
-    EofChar: Char;         // End of Input character
-    EvtChar: Char;         // Received Event character
+    XonChar: AnsiChar;         // Tx and Rx X-ON character
+    XoffChar: AnsiChar;        // Tx and Rx X-OFF character
+    ErrorChar: AnsiChar;       // Error replacement AnsiChar
+    EofChar: AnsiChar;         // End of Input character
+    EvtChar: AnsiChar;         // Received Event character
     wReserved1: WORD;      // Fill for now.
   end;
   {$EXTERNALSYM _DCB}
@@ -1574,7 +1574,7 @@ type
     nErrCode: Word;
     Reserved1: Word;
     Reserved2: Word;
-    szPathName: array [0..OFS_MAXPATHNAME - 1] of CHAR;
+    szPathName: array [0..OFS_MAXPATHNAME - 1] of AnsiChar;
   end;
   {$EXTERNALSYM _OFSTRUCT}
   OFSTRUCT = _OFSTRUCT;
@@ -2596,7 +2596,7 @@ function SetCommState(hFile: HANDLE; const lpDCB: DCB): BOOL; stdcall;
 function SetCommTimeouts(hFile: HANDLE; const lpCommTimeouts: COMMTIMEOUTS): BOOL; stdcall;
 {$EXTERNALSYM SetCommTimeouts}
 
-function TransmitCommChar(hFile: HANDLE; cChar: Char): BOOL; stdcall;
+function TransmitCommChar(hFile: HANDLE; cChar: AnsiChar): BOOL; stdcall;
 {$EXTERNALSYM TransmitCommChar}
 
 function WaitCommEvent(hFile: HANDLE; var lpEvtMask: DWORD;
@@ -3277,8 +3277,8 @@ type
     nFileSizeLow: DWORD;
     dwReserved0: DWORD;
     dwReserved1: DWORD;
-    cFileName: array [0..MAX_PATH - 1] of CHAR;
-    cAlternateFileName: array [0..13] of CHAR;
+    cFileName: array [0..MAX_PATH - 1] of AnsiChar;
+    cAlternateFileName: array [0..13] of AnsiChar;
   end;
   {$EXTERNALSYM _WIN32_FIND_DATAA}
   WIN32_FIND_DATAA = _WIN32_FIND_DATAA;
@@ -5511,8 +5511,8 @@ type
   {$EXTERNALSYM LPHW_PROFILE_INFOA}
   tagHW_PROFILE_INFOA = record
     dwDockInfo: DWORD;
-    szHwProfileGuid: array [0..HW_PROFILE_GUIDLEN - 1] of CHAR;
-    szHwProfileName: array [0..MAX_PROFILE_LEN - 1] of CHAR;
+    szHwProfileGuid: array [0..HW_PROFILE_GUIDLEN - 1] of AnsiChar;
+    szHwProfileName: array [0..MAX_PROFILE_LEN - 1] of AnsiChar;
   end;
   {$EXTERNALSYM tagHW_PROFILE_INFOA}
   HW_PROFILE_INFOA = tagHW_PROFILE_INFOA;

packages/winunits-jedi/src/jwawinber.pas

@@ -172,7 +172,7 @@ function ber_peek_tag(pBerElement: PBerElement; var pLen: ULONG): ULONG; cdecl;
 // subsequent invocations of ber_next_element().
 //
 
-function ber_first_element(pBerElement: PBerElement; var pLen: ULONG; var ppOpaque: PChar): ULONG; cdecl;
+function ber_first_element(pBerElement: PBerElement; var pLen: ULONG; var ppOpaque: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ber_first_element}
 
 //
@@ -183,7 +183,7 @@ function ber_first_element(pBerElement: PBerElement; var pLen: ULONG; var ppOpaq
 // is returned.
 //
 
-function ber_next_element(pBerElement: PBerElement; var pLen: ULONG; opaque: PChar): ULONG; cdecl;
+function ber_next_element(pBerElement: PBerElement; var pLen: ULONG; opaque: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ber_next_element}
 
 //
@@ -236,21 +236,21 @@ The format string can contain the following format characters:
         If this format character is not preceded by the 't' format
         modifier, the tag 0x05U is used for the element.
         
-'o'     Octet string.  The next two arguments are a char *, followed by
+'o'     Octet string.  The next two arguments are a AnsiChar *, followed by
         a ber_len_t with the length of the string.  The string MAY con-
         tain null bytes and are do not have to be zero-terminated.   An
         octet string element is output, in primitive form.  If this for-
         mat character is not preceded by the 't' format modifier, the
         tag 0x04U is used for the element.
 
-'s'     Octet string.  The next argument is a char * pointing to a
+'s'     Octet string.  The next argument is a AnsiChar * pointing to a
         zero-terminated string.  An octet string element in primitive
         form is output, which does not include the trailing '\0' (null)
         byte. If this format character is not preceded by the 't' format
         modifier, the tag 0x04U is used for the element.
 
-'v'     Several octet strings.  The next argument is a char **, an array
-        of char * pointers to zero-terminated strings.  The last element
+'v'     Several octet strings.  The next argument is a AnsiChar **, an array
+        of AnsiChar * pointers to zero-terminated strings.  The last element
         in the array MUST be a NULL pointer. The octet strings do not
         include the trailing '\0' (null) byte.  Note that a construct
         like '{v}' is used to get an actual SEQUENCE OF octet strings.
@@ -276,7 +276,7 @@ The format string can contain the following format characters:
         be used with this format character.
 *)
 
-//WINBERAPI INT BERAPI ber_printf( BerElement *pBerElement, PCHAR fmt, ... );
+//WINBERAPI INT BERAPI ber_printf( BerElement *pBerElement, PAnsiChar fmt, ... );
 
 (*
 The ber_scanf() routine is used to decode a BER element in much the same
@@ -293,7 +293,7 @@ The format string contains conversion specifications which are used to
 direct the interpretation of the BER element.  The format string can
 contain the following characters:
 
-'a'     Octet string.  A char ** argument MUST be supplied.  Memory is
+'a'     Octet string.  A AnsiChar ** argument MUST be supplied.  Memory is
         allocated, filled with the contents of the octet string, zero-
         terminated, and the pointer to the string is stored in the argu-
         ment.  The returned value SHOULD be freed using ldap_memfree.
@@ -327,7 +327,7 @@ contain the following characters:
         ignored during the decoding.  ber_scanf() will return an error
         if the integer cannot be stored in a ber_int_t.
 
-'B'     Bitstring.  A char ** argument MUST be supplied which will point
+'B'     Bitstring.  A AnsiChar ** argument MUST be supplied which will point
         to the allocated bits, followed by a ber_len_t * argument, which
         will point to the length (in bits) of the bitstring returned.
         ldap_memfree SHOULD be called to free the bitstring.  The tag of
@@ -338,9 +338,9 @@ contain the following characters:
 'n'     Null.  No argument is needed.  The element is verified to have a
         zero-length value and is skipped.  The tag is ignored.
 
-'v'     Several octet strings.  A char *** argument MUST be supplied,
+'v'     Several octet strings.  A AnsiChar *** argument MUST be supplied,
         which upon return points to an allocated NULL-terminated array
-        of char *'s containing the octet strings.  NULL is stored if the
+        of AnsiChar *'s containing the octet strings.  NULL is stored if the
         sequence is empty.  ldap_memfree SHOULD be called to free each
         element of the array and the array itself.  The tag of the
         sequence and of the octet strings are ignored.
@@ -368,7 +368,7 @@ contain the following characters:
 
 *)
 
-//WINBERAPI ULONG BERAPI ber_scanf( BerElement *pBerElement, PCHAR fmt, ... );
+//WINBERAPI ULONG BERAPI ber_scanf( BerElement *pBerElement, PAnsiChar fmt, ... );
 
 {$ENDIF JWA_IMPLEMENTATIONSECTION}
 

packages/winunits-jedi/src/jwawincon.pas

@@ -97,7 +97,7 @@ type
   TCharUnion = record
     case Integer of
       0: (UnicodeChar: WCHAR);
-      1: (AsciiChar: CHAR);
+      1: (AsciiChar: AnsiChar);
   end;
 
   PKEY_EVENT_RECORD = ^KEY_EVENT_RECORD;
@@ -523,7 +523,7 @@ function WriteConsoleOutputAttribute(hConsoleOutput: HANDLE; lpAttribute: PWORD;
   nLength: DWORD; dwWriteCoord: COORD; var lpNumberOfAttrsWritten: DWORD): BOOL; stdcall;
 {$EXTERNALSYM WriteConsoleOutputAttribute}
 
-function FillConsoleOutputCharacterA(hConsoleOutput: HANDLE; cCharacter: CHAR;
+function FillConsoleOutputCharacterA(hConsoleOutput: HANDLE; cCharacter: AnsiChar;
   nLength: DWORD; dwWriteCoord: COORD; var lpNumberOfCharsWritten: DWORD): BOOL; stdcall;
 {$EXTERNALSYM FillConsoleOutputCharacterA}
 function FillConsoleOutputCharacterW(hConsoleOutput: HANDLE; cCharacter: WCHAR;

packages/winunits-jedi/src/jwawincpl.pas

@@ -141,9 +141,9 @@ type
     dwHelpContext: DWORD;                // help context to use
     lData: LONG_PTR;                     // user defined data
     hIcon: HICON; // icon to use, this is owned by CONTROL.EXE (may be deleted)
-    szName: array [0..31] of CHAR;       // short name
-    szInfo: array [0..63] of CHAR;       // long name (status line)
-    szHelpFile: array [0..127] of CHAR;  // path to help file to use
+    szName: array [0..31] of AnsiChar;       // short name
+    szInfo: array [0..63] of AnsiChar;       // long name (status line)
+    szHelpFile: array [0..127] of AnsiChar;  // path to help file to use
   end;
   {$EXTERNALSYM tagNEWCPLINFOA}
   NEWCPLINFOA = tagNEWCPLINFOA;

packages/winunits-jedi/src/jwawincrypt.pas

@@ -1056,7 +1056,7 @@ type
     aiAlgid: ALG_ID;
     dwBitLen: DWORD;
     dwNameLen: DWORD;
-    szName: array [0..19] of CHAR;
+    szName: array [0..19] of AnsiChar;
   end;
   {$EXTERNALSYM _PROV_ENUMALGS}
   PROV_ENUMALGS = _PROV_ENUMALGS;
@@ -1073,9 +1073,9 @@ type
     dwMaxLen: DWORD;
     dwProtocols: DWORD;
     dwNameLen: DWORD;
-    szName: array [0..19] of CHAR;
+    szName: array [0..19] of AnsiChar;
     dwLongNameLen: DWORD;
-    szLongName: array [0..39] of CHAR;
+    szLongName: array [0..39] of AnsiChar;
   end;
   {$EXTERNALSYM _PROV_ENUMALGS_EX}
   PROV_ENUMALGS_EX = _PROV_ENUMALGS_EX;
@@ -2061,7 +2061,7 @@ const
 //  These UNICODE characters are encoded as UTF8 8 bit characters.
 //
 //  For CertDecodeName, two 0 bytes are always appended to the end of the
-//  string (ensures a CHAR or WCHAR string is null terminated).
+//  string (ensures a AnsiChar or WCHAR string is null terminated).
 //  These added 0 bytes are't included in the BLOB.cbData.
 //--------------------------------------------------------------------------
 
@@ -12813,15 +12813,15 @@ function CryptHashPublicKeyInfo(hCryptProv: HCRYPTPROV; Algid: ALG_ID;
 {$EXTERNALSYM CryptHashPublicKeyInfo}
 
 //+-------------------------------------------------------------------------
-//  Convert a Name Value to a null terminated char string
+//  Convert a Name Value to a null terminated AnsiChar string
 //
 //  Returns the number of characters converted including the terminating null
 //  character. If psz is NULL or csz is 0, returns the required size of the
-//  destination string (including the terminating null char).
+//  destination string (including the terminating null AnsiChar).
 //
 //  If psz != NULL && csz != 0, returned psz is always NULL terminated.
 //
-//  Note: csz includes the NULL char.
+//  Note: csz includes the NULL AnsiChar.
 //--------------------------------------------------------------------------
 
 function CertRDNValueToStrA(dwValueType: DWORD; pValue: PCERT_RDN_VALUE_BLOB;
@@ -12829,15 +12829,15 @@ function CertRDNValueToStrA(dwValueType: DWORD; pValue: PCERT_RDN_VALUE_BLOB;
 {$EXTERNALSYM CertRDNValueToStrA}
 
 //+-------------------------------------------------------------------------
-//  Convert a Name Value to a null terminated char string
+//  Convert a Name Value to a null terminated AnsiChar string
 //
 //  Returns the number of characters converted including the terminating null
 //  character. If psz is NULL or csz is 0, returns the required size of the
-//  destination string (including the terminating null char).
+//  destination string (including the terminating null AnsiChar).
 //
 //  If psz != NULL && csz != 0, returned psz is always NULL terminated.
 //
-//  Note: csz includes the NULL char.
+//  Note: csz includes the NULL AnsiChar.
 //--------------------------------------------------------------------------
 
 function CertRDNValueToStrW(dwValueType: DWORD; pValue: PCERT_RDN_VALUE_BLOB;
@@ -12848,7 +12848,7 @@ function CertRDNValueToStr(dwValueType: DWORD; pValue: PCERT_RDN_VALUE_BLOB;
 {$EXTERNALSYM CertRDNValueToStr}
 
 //+-------------------------------------------------------------------------
-//  Convert the certificate name blob to a null terminated char string.
+//  Convert the certificate name blob to a null terminated AnsiChar string.
 //
 //  Follows the string representation of distinguished names specified in
 //  RFC 1779. (Note, added double quoting "" for embedded quotes, quote
@@ -12902,11 +12902,11 @@ function CertRDNValueToStr(dwValueType: DWORD; pValue: PCERT_RDN_VALUE_BLOB;
 //
 //  Returns the number of characters converted including the terminating null
 //  character. If psz is NULL or csz is 0, returns the required size of the
-//  destination string (including the terminating null char).
+//  destination string (including the terminating null AnsiChar).
 //
 //  If psz != NULL && csz != 0, returned psz is always NULL terminated.
 //
-//  Note: csz includes the NULL char.
+//  Note: csz includes the NULL AnsiChar.
 //--------------------------------------------------------------------------
 
 //+-------------------------------------------------------------------------
@@ -13132,13 +13132,13 @@ function CertStrToName(dwCertEncodingType: DWORD; pszX500: LPCTSTR;
 //  Returns the number of characters converted including the terminating null
 //  character. If pwszNameString is NULL or cchNameString is 0, returns the
 //  required size of the destination string (including the terminating null
-//  char). If the specified name type isn't found. returns an empty string
+//  AnsiChar). If the specified name type isn't found. returns an empty string
 //  with a returned character count of 1.
 //
 //  If pwszNameString != NULL && cwszNameString != 0, returned pwszNameString
 //  is always NULL terminated.
 //
-//  Note: cchNameString includes the NULL char.
+//  Note: cchNameString includes the NULL AnsiChar.
 //--------------------------------------------------------------------------
 
 //+-------------------------------------------------------------------------
@@ -16059,9 +16059,9 @@ const
 // CRYPT_STRING_BASE64X509CRLHEADER - base64 format with x509 crl begin
 //                                    and end headers
 // CRYPT_STRING_HEX - only hex format
-// CRYPT_STRING_HEXASCII - hex format with ascii char display
+// CRYPT_STRING_HEXASCII - hex format with ascii AnsiChar display
 // CRYPT_STRING_HEXADDR - hex format with address display
-// CRYPT_STRING_HEXASCIIADDR - hex format with ascii char and address display
+// CRYPT_STRING_HEXASCIIADDR - hex format with ascii AnsiChar and address display
 //
 // CryptBinaryToString accepts CRYPT_STRING_NOCR or'd into one of the above.
 // When set, line breaks contain only LF, instead of CR-LF pairs.

packages/winunits-jedi/src/jwawindns.pas

@@ -348,10 +348,10 @@ const
 
 {
 #define DNS_QUESTION_NAME_FROM_HEADER( _pHeader_ ) \
-            ( (PCHAR)( (PDNS_HEADER)(_pHeader_) + 1 ) )
+            ( (PAnsiChar)( (PDNS_HEADER)(_pHeader_) + 1 ) )
 
 #define DNS_ANSWER_FROM_QUESTION( _pQuestion_ ) \
-            ( (PCHAR)( (PDNS_QUESTION)(_pQuestion_) + 1 ) )
+            ( (PAnsiChar)( (PDNS_QUESTION)(_pQuestion_) + 1 ) )
 }
 
 //
@@ -1797,7 +1797,7 @@ type
   {$EXTERNALSYM PDNS_MESSAGE_BUFFER}
   _DNS_MESSAGE_BUFFER = record
     MessageHead: DNS_HEADER;
-    MessageBody: array [0..0] of CHAR;
+    MessageBody: array [0..0] of AnsiChar;
   end;
   {$EXTERNALSYM _DNS_MESSAGE_BUFFER}
   DNS_MESSAGE_BUFFER = _DNS_MESSAGE_BUFFER;
@@ -1899,10 +1899,10 @@ end;
 
 {
 #define DNS_QUESTION_NAME_FROM_HEADER( _pHeader_ ) \
-            ( (PCHAR)( (PDNS_HEADER)(_pHeader_) + 1 ) )
+            ( (PAnsiChar)( (PDNS_HEADER)(_pHeader_) + 1 ) )
 
 #define DNS_ANSWER_FROM_QUESTION( _pQuestion_ ) \
-            ( (PCHAR)( (PDNS_QUESTION)(_pQuestion_) + 1 ) )
+            ( (PAnsiChar)( (PDNS_QUESTION)(_pQuestion_) + 1 ) )
 }
 
 function IS_WORD_ALIGNED(P: Pointer): BOOL;
@@ -1922,7 +1922,7 @@ end;
 
 function DNS_TEXT_RECORD_LENGTH(StringCount: Integer): Integer;
 begin
-  Result := SizeOf(DWORD) + ((StringCount) * SizeOf(PChar));
+  Result := SizeOf(DWORD) + ((StringCount) * SizeOf(PAnsiChar));
 end;
 
 function DNS_NULL_RECORD_LENGTH(ByteCount: Integer): Integer;

packages/winunits-jedi/src/jwawinfax.pas

@@ -1185,7 +1185,7 @@ type
   _FAX_CONTEXT_INFOA = record
     SizeOfStruct: DWORD; // Size of this structure
     hDC: HDC; // Device Context
-    ServerName: array [0..MAX_COMPUTERNAME_LENGTH] of CHAR; // Server name
+    ServerName: array [0..MAX_COMPUTERNAME_LENGTH] of AnsiChar; // Server name
   end;
   {$EXTERNALSYM _FAX_CONTEXT_INFOA}
   FAX_CONTEXT_INFOA = _FAX_CONTEXT_INFOA;

packages/winunits-jedi/src/jwawingdi.pas

@@ -1088,7 +1088,7 @@ type
     lcsGammaRed: DWORD;
     lcsGammaGreen: DWORD;
     lcsGammaBlue: DWORD;
-    lcsFilename: array [0..MAX_PATH - 1] of CHAR;
+    lcsFilename: array [0..MAX_PATH - 1] of AnsiChar;
   end;
   {$EXTERNALSYM tagLOGCOLORSPACEA}
   LOGCOLORSPACEA = tagLOGCOLORSPACEA;
@@ -1882,7 +1882,7 @@ type
     lfClipPrecision: BYTE;
     lfQuality: BYTE;
     lfPitchAndFamily: BYTE;
-    lfFaceName: array [0..LF_FACESIZE - 1] of CHAR;
+    lfFaceName: array [0..LF_FACESIZE - 1] of AnsiChar;
   end;
   {$EXTERNALSYM tagLOGFONTA}
   LOGFONTA = tagLOGFONTA;
@@ -3830,11 +3830,11 @@ type
   PDisplayDeviceA = ^TDisplayDeviceA;
   _DISPLAY_DEVICEA = record
     cb: DWORD;
-    DeviceName: array [0..32 - 1] of CHAR;
-    DeviceString: array [0..128 - 1] of CHAR;
+    DeviceName: array [0..32 - 1] of AnsiChar;
+    DeviceString: array [0..128 - 1] of AnsiChar;
     StateFlags: DWORD;
-    DeviceID: array [0..128 - 1] of CHAR;
-    DeviceKey: array [0..128 - 1] of CHAR;
+    DeviceID: array [0..128 - 1] of AnsiChar;
+    DeviceKey: array [0..128 - 1] of AnsiChar;
   end;
   {$EXTERNALSYM _DISPLAY_DEVICEA}
   DISPLAY_DEVICEA = _DISPLAY_DEVICEA;
@@ -3932,7 +3932,7 @@ type
   PRgnData = ^TRgnData;
   _RGNDATA = record
     rdh: RGNDATAHEADER;
-    Buffer: array [0..0] of Char;
+    Buffer: array [0..0] of AnsiChar;
   end;
   {$EXTERNALSYM _RGNDATA}
   RGNDATA = _RGNDATA;

packages/winunits-jedi/src/jwawinioctl.pas

@@ -5013,7 +5013,7 @@ var
   Partition: PDiskPartitionInfo;
 begin
   Partition := DiskGeometryGetPartition(Geometry);
-  Result := PDiskDetectionInfo(PChar(Partition) + Partition^.SizeOfPartitionInfo*SizeOf(DWORD));
+  Result := PDiskDetectionInfo(PAnsiChar(Partition) + Partition^.SizeOfPartitionInfo*SizeOf(DWORD));
 end;
 
 {$ENDIF JWA_INTERFACESECTION}

packages/winunits-jedi/src/jwawinldap.pas

@@ -521,7 +521,7 @@ type
     //  Following parameters MAY match up to reference implementation of LDAP
     //
 
-    ld_host: PChar;
+    ld_host: PAnsiChar;
     ld_version: ULONG;
     ld_lberoptions: Byte;
 
@@ -536,8 +536,8 @@ type
     ld_sizelimit: ULONG;
 
     ld_errno: ULONG;
-    ld_matched: PChar;
-    ld_error: PChar;
+    ld_matched: PAnsiChar;
+    ld_error: PAnsiChar;
     ld_msgid: ULONG;
 
     Reserved3: array  [0..6*SizeOf(ULONG)] of Byte;
@@ -585,7 +585,7 @@ type
   {$EXTERNALSYM berval}
   berval = record
     bv_len: ULONG;
-    bv_val: PChar;
+    bv_val: PAnsiChar;
   end;
   {$EXTERNALSYM LDAP_BERVAL}
   LDAP_BERVAL = berval;
@@ -764,21 +764,21 @@ function ldap_openA(HostName: PAnsiChar; PortNumber: ULONG): PLDAP; cdecl;
 {$EXTERNALSYM ldap_openW}
 function ldap_openW(HostName: PWideChar; PortNumber: ULONG): PLDAP; cdecl;
 {$EXTERNALSYM ldap_open}
-function ldap_open(HostName: PChar; PortNumber: ULONG): PLDAP; cdecl;
+function ldap_open(HostName: PAnsiChar; PortNumber: ULONG): PLDAP; cdecl;
 
 {$EXTERNALSYM ldap_initA}
 function ldap_initA(HostName: PAnsiChar; PortNumber: ULONG): PLDAP; cdecl;
 {$EXTERNALSYM ldap_initW}
 function ldap_initW(HostName: PWideChar; PortNumber: ULONG): PLDAP; cdecl;
 {$EXTERNALSYM ldap_init}
-function ldap_init(HostName: PChar; PortNumber: ULONG): PLDAP; cdecl;
+function ldap_init(HostName: PAnsiChar; PortNumber: ULONG): PLDAP; cdecl;
 
 {$EXTERNALSYM ldap_sslinitA}
 function ldap_sslinitA(HostName: PAnsiChar; PortNumber: ULONG; secure: integer): PLDAP; cdecl;
 {$EXTERNALSYM ldap_sslinitW}
 function ldap_sslinitW(HostName: PWideChar; PortNumber: ULONG; secure: integer): PLDAP; cdecl;
 {$EXTERNALSYM ldap_sslinit}
-function ldap_sslinit(HostName: PChar; PortNumber: ULONG; secure: integer): PLDAP; cdecl;
+function ldap_sslinit(HostName: PAnsiChar; PortNumber: ULONG; secure: integer): PLDAP; cdecl;
 
 //
 //  when calling ldap_init, you can call ldap_connect explicitly to have the
@@ -803,7 +803,7 @@ function cldap_openA(HostName: PAnsiChar; PortNumber: ULONG): PLDAP; cdecl;
 {$EXTERNALSYM cldap_openW}
 function cldap_openW(HostName: PWideChar; PortNumber: ULONG): PLDAP; cdecl;
 {$EXTERNALSYM cldap_open}
-function cldap_open(HostName: PChar; PortNumber: ULONG): PLDAP; cdecl;
+function cldap_open(HostName: PAnsiChar; PortNumber: ULONG): PLDAP; cdecl;
 
 //
 //  Call unbind when you're done with the connection, it will free all
@@ -1023,26 +1023,26 @@ function ldap_simple_bindA(ld: PLDAP; dn, passwd: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_simple_bindW}
 function ldap_simple_bindW(ld: PLDAP; dn, passwd: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_simple_bind}
-function ldap_simple_bind(ld: PLDAP; dn, passwd: PChar): ULONG; cdecl;
+function ldap_simple_bind(ld: PLDAP; dn, passwd: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_simple_bind_sA}
 function ldap_simple_bind_sA(ld: PLDAP; dn, passwd: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_simple_bind_sW}
 function ldap_simple_bind_sW(ld: PLDAP; dn, passwd: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_simple_bind_s}
-function ldap_simple_bind_s(ld: PLDAP; dn, passwd: PChar): ULONG; cdecl;
+function ldap_simple_bind_s(ld: PLDAP; dn, passwd: PAnsiChar): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_bindA}
 function ldap_bindA(ld: PLDAP; dn, cred: PAnsiChar; method: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_bindW}
 function ldap_bindW(ld: PLDAP; dn, cred: PWideChar; method: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_bind}
-function ldap_bind(ld: PLDAP; dn, cred: PChar; method: ULONG): ULONG; cdecl;
+function ldap_bind(ld: PLDAP; dn, cred: PAnsiChar; method: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_bind_sA}
 function ldap_bind_sA(ld: PLDAP; dn, cred: PAnsiChar; method: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_bind_sW}
 function ldap_bind_sW(ld: PLDAP; dn, cred: PWideChar; method: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_bind_s}
-function ldap_bind_s(ld: PLDAP; dn, cred: PChar; method: ULONG): ULONG; cdecl;
+function ldap_bind_s(ld: PLDAP; dn, cred: PAnsiChar; method: ULONG): ULONG; cdecl;
 
 // The following functions can be used to pass in any arbitrary credentials
 // to the server. The application must be ready to interpret the response
@@ -1060,8 +1060,8 @@ function ldap_sasl_bindW(ExternalHandle: PLDAP; DistName: PWideChar;
   var ServerCtrls, ClientCtrls: PLDAPControlW;
   var MessageNumber: Integer): Integer; cdecl;
 {$EXTERNALSYM ldap_sasl_bind}
-function ldap_sasl_bind(ExternalHandle: PLDAP; DistName: PChar;
-  AuthMechanism: PChar; cred: PBERVAL;
+function ldap_sasl_bind(ExternalHandle: PLDAP; DistName: PAnsiChar;
+  AuthMechanism: PAnsiChar; cred: PBERVAL;
   var ServerCtrls, ClientCtrls: PLDAPControl;
   var MessageNumber: Integer): Integer; cdecl;
 
@@ -1073,8 +1073,8 @@ function ldap_sasl_bind_sW(ExternalHandle: PLDAP; DistName: PWideChar;
   AuthMechanism: PWideChar; cred: PBERVAL;
   var ServerCtrls, ClientCtrls: PLDAPControlW;
   var ServerData: PBERVAL): Integer; cdecl;
-function ldap_sasl_bind_s(ExternalHandle: PLDAP; DistName: PChar;
-  AuthMechanism: PChar; cred: PBERVAL;
+function ldap_sasl_bind_s(ExternalHandle: PLDAP; DistName: PAnsiChar;
+  AuthMechanism: PAnsiChar; cred: PBERVAL;
   var ServerCtrls, ClientCtrls: PLDAPControl;
   var ServerData: PBERVAL): Integer; cdecl;
 
@@ -1115,10 +1115,10 @@ function ldap_searchW(
 {$EXTERNALSYM ldap_search}
 function ldap_search(
   ld: PLDAP;
-  base: PChar;        // distinguished name or ''
+  base: PAnsiChar;        // distinguished name or ''
   scope: ULONG;           // LDAP_SCOPE_xxxx
-  filter: PChar;
-  attrs: PChar;       // pointer to an array of PAnsiChar attribute names
+  filter: PAnsiChar;
+  attrs: PAnsiChar;       // pointer to an array of PAnsiChar attribute names
   attrsonly: ULONG        // boolean on whether to only return attr names
 ): ULONG; cdecl;
 
@@ -1131,8 +1131,8 @@ function ldap_search_sW(ld: PLDAP; base: PWideChar; scope: ULONG;
   filter, attrs: PWideChar; attrsonly: ULONG;
   var res: PLDAPMessage): ULONG; cdecl;
 {$EXTERNALSYM ldap_search_s}
-function ldap_search_s(ld: PLDAP; base: PChar; scope: ULONG;
-  filter, attrs: PChar; attrsonly: ULONG;
+function ldap_search_s(ld: PLDAP; base: PAnsiChar; scope: ULONG;
+  filter, attrs: PAnsiChar; attrsonly: ULONG;
   var res: PLDAPMessage): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_search_stA}
@@ -1144,8 +1144,8 @@ function ldap_search_stW(ld: PLDAP; base: PWideChar; scope: ULONG;
   filter, attrs: PWideChar; attrsonly:  ULONG; var timeout: TLDAPTimeVal;
   var res: PLDAPMessage): ULONG; cdecl;
 {$EXTERNALSYM ldap_search_st}
-function ldap_search_st(ld: PLDAP; base: PChar; scope: ULONG;
-  filter, attrs: PChar; attrsonly:  ULONG; var timeout: TLDAPTimeVal;
+function ldap_search_st(ld: PLDAP; base: PAnsiChar; scope: ULONG;
+  filter, attrs: PAnsiChar; attrsonly:  ULONG; var timeout: TLDAPTimeVal;
   var res: PLDAPMessage): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_search_extA}
@@ -1159,8 +1159,8 @@ function ldap_search_extW(ld: PLDAP; base: PWideChar; scope: ULONG;
   var ServerControls, ClientControls: PLDAPControlW;
   TimeLimit, SizeLimit: ULONG; var MessageNumber: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_search_ext}
-function ldap_search_ext(ld: PLDAP; base: PChar; scope: ULONG;
-  filter, attrs: PChar; attrsonly: ULONG;
+function ldap_search_ext(ld: PLDAP; base: PAnsiChar; scope: ULONG;
+  filter, attrs: PAnsiChar; attrsonly: ULONG;
   ServerControls, ClientControls: PPLDAPControl;
   TimeLimit, SizeLimit: ULONG; var MessageNumber: ULONG): ULONG; cdecl;
 
@@ -1177,8 +1177,8 @@ function ldap_search_ext_sW(ld: PLDAP; base: PWideChar; scope: ULONG;
   var timeout: TLDAPTimeVal; SizeLimit: ULONG;
   var res: PLDAPMessage): ULONG; cdecl;
 {$EXTERNALSYM ldap_search_ext_s}
-function ldap_search_ext_s(ld: PLDAP; base: PChar; scope: ULONG;
-  filter, attrs: PChar; attrsonly: ULONG;
+function ldap_search_ext_s(ld: PLDAP; base: PAnsiChar; scope: ULONG;
+  filter, attrs: PAnsiChar; attrsonly: ULONG;
   ServerControls, ClientControls: PPLDAPControl;
   timeout: PLDAPTimeVal; SizeLimit: ULONG;
   var res: PLDAPMessage): ULONG; cdecl;
@@ -1193,7 +1193,7 @@ function ldap_check_filterA(ld: PLDAP; SearchFilter: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_check_filterW}
 function ldap_check_filterW(ld: PLDAP; SearchFilter: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_check_filter}
-function ldap_check_filter(ld: PLDAP; SearchFilter: PChar): ULONG; cdecl;
+function ldap_check_filter(ld: PLDAP; SearchFilter: PAnsiChar): ULONG; cdecl;
 
 //
 //  modify an existing entry
@@ -1215,14 +1215,14 @@ function ldap_modifyA(ld: PLDAP; dn: PAnsiChar; var mods: PLDAPModA): ULONG; cde
 {$EXTERNALSYM ldap_modifyW}
 function ldap_modifyW(ld: PLDAP; dn: PWideChar; var mods: PLDAPModW): ULONG; cdecl;
 {$EXTERNALSYM ldap_modify}
-function ldap_modify(ld: PLDAP; dn: PChar; var mods: PLDAPMod): ULONG; cdecl;
+function ldap_modify(ld: PLDAP; dn: PAnsiChar; var mods: PLDAPMod): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_modify_sA}
 function ldap_modify_sA(ld: PLDAP; dn: PAnsiChar; var mods: PLDAPModA): ULONG; cdecl;
 {$EXTERNALSYM ldap_modify_sW}
 function ldap_modify_sW(ld: PLDAP; dn: PWideChar; var mods: PLDAPModW): ULONG; cdecl;
 {$EXTERNALSYM ldap_modify_s}
-function ldap_modify_s(ld: PLDAP; dn: PChar; var mods: PLDAPMod): ULONG; cdecl;
+function ldap_modify_s(ld: PLDAP; dn: PAnsiChar; var mods: PLDAPMod): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_modify_extA}
 function ldap_modify_extA(ld: PLDAP; dn: PAnsiChar; var mods: PLDAPModA;
@@ -1233,7 +1233,7 @@ function ldap_modify_extW(ld: PLDAP; dn: PWideChar; var mods: PLDAPModW;
   var ServerControls, ClientControls: PLDAPControlW;
   var MessageNumber: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_modify_ext}
-function ldap_modify_ext(ld: PLDAP; dn: PChar; var mods: PLDAPMod;
+function ldap_modify_ext(ld: PLDAP; dn: PAnsiChar; var mods: PLDAPMod;
   var ServerControls, ClientControls: PLDAPControl;
   var MessageNumber: ULONG): ULONG; cdecl;
 
@@ -1244,7 +1244,7 @@ function ldap_modify_ext_sA(ld: PLDAP; dn: PAnsiChar; var mods: PLDAPModA;
 function ldap_modify_ext_sW(ld: PLDAP; dn: PWideChar; var mods: PLDAPModW;
   var ServerControls, ClientControls: PLDAPControlW): ULONG; cdecl;
 {$EXTERNALSYM ldap_modify_ext_s}
-function ldap_modify_ext_s(ld: PLDAP; dn: PChar; var mods: PLDAPMod;
+function ldap_modify_ext_s(ld: PLDAP; dn: PAnsiChar; var mods: PLDAPMod;
   var ServerControls, ClientControls: PLDAPControl): ULONG; cdecl;
 
 //
@@ -1293,7 +1293,7 @@ function ldap_modrdn2W(var ExternalHandle: LDAP;
   DeleteOldRdn: Integer): ULONG; cdecl;
 {$EXTERNALSYM ldap_modrdn2}
 function ldap_modrdn2(var ExternalHandle: LDAP;
-  DistinguishedName, NewDistinguishedName: PChar;
+  DistinguishedName, NewDistinguishedName: PAnsiChar;
   DeleteOldRdn: Integer): ULONG; cdecl;
 
 //
@@ -1308,7 +1308,7 @@ function ldap_modrdnW(var ExternalHandle: LDAP;
   DistinguishedName, NewDistinguishedName: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_modrdn}
 function ldap_modrdn(var ExternalHandle: LDAP;
-  DistinguishedName, NewDistinguishedName: PChar): ULONG; cdecl;
+  DistinguishedName, NewDistinguishedName: PAnsiChar): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_modrdn2_sA}
 function ldap_modrdn2_sA(var ExternalHandle: LDAP;
@@ -1320,7 +1320,7 @@ function ldap_modrdn2_sW(var ExternalHandle: LDAP;
   DeleteOldRdn: Integer): ULONG; cdecl;
 {$EXTERNALSYM ldap_modrdn2_s}
 function ldap_modrdn2_s(var ExternalHandle: LDAP;
-  DistinguishedName, NewDistinguishedName: PChar;
+  DistinguishedName, NewDistinguishedName: PAnsiChar;
   DeleteOldRdn: Integer): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_modrdn_sA}
@@ -1331,7 +1331,7 @@ function ldap_modrdn_sW(var ExternalHandle: LDAP;
   DistinguishedName, NewDistinguishedName: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_modrdn_s}
 function ldap_modrdn_s(var ExternalHandle: LDAP;
-  DistinguishedName, NewDistinguishedName: PChar): ULONG; cdecl;
+  DistinguishedName, NewDistinguishedName: PAnsiChar): ULONG; cdecl;
 
 //
 //  Extended Rename operations.  These take controls and separate out the
@@ -1347,7 +1347,7 @@ function ldap_rename_extW(ld: PLDAP; dn, NewRDN, NewParent: PWideChar;
   DeleteOldRdn: Integer; var ServerControls, ClientControls: PLDAPControlW;
   var MessageNumber: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_rename_ext}
-function ldap_rename_ext(ld: PLDAP; dn, NewRDN, NewParent: PChar;
+function ldap_rename_ext(ld: PLDAP; dn, NewRDN, NewParent: PAnsiChar;
   DeleteOldRdn: Integer; var ServerControls, ClientControls: PLDAPControl;
   var MessageNumber: ULONG): ULONG; cdecl;
 
@@ -1361,7 +1361,7 @@ function ldap_rename_ext_sW(ld: PLDAP;
   var ServerControls, ClientControls: PLDAPControlW): ULONG; cdecl;
 {$EXTERNALSYM ldap_rename_ext_s}
 function ldap_rename_ext_s(ld: PLDAP;
-  dn, NewRDN, NewParent: PChar; DeleteOldRdn: Integer;
+  dn, NewRDN, NewParent: PAnsiChar; DeleteOldRdn: Integer;
   var ServerControls, ClientControls: PLDAPControl): ULONG; cdecl;
 
 //
@@ -1384,14 +1384,14 @@ function ldap_addA(ld: PLDAP; dn: PAnsiChar; var attrs: PLDAPModA): ULONG; cdecl
 {$EXTERNALSYM ldap_addW}
 function ldap_addW(ld: PLDAP; dn: PWideChar; var attrs: PLDAPModW): ULONG; cdecl;
 {$EXTERNALSYM ldap_add}
-function ldap_add(ld: PLDAP; dn: PChar; var attrs: PLDAPMod): ULONG; cdecl;
+function ldap_add(ld: PLDAP; dn: PAnsiChar; var attrs: PLDAPMod): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_add_sA}
 function ldap_add_sA(ld: PLDAP; dn: PAnsiChar; var attrs: PLDAPModA): ULONG; cdecl;
 {$EXTERNALSYM ldap_add_sW}
 function ldap_add_sW(ld: PLDAP; dn: PWideChar; var attrs: PLDAPModW): ULONG; cdecl;
 {$EXTERNALSYM ldap_add_s}
-function ldap_add_s(ld: PLDAP; dn: PChar; var attrs: PLDAPMod): ULONG; cdecl;
+function ldap_add_s(ld: PLDAP; dn: PAnsiChar; var attrs: PLDAPMod): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_add_extA}
 function ldap_add_extA(ld: PLDAP; dn: PAnsiChar; var attrs: PLDAPModA;
@@ -1402,7 +1402,7 @@ function ldap_add_extW(ld: PLDAP; dn: PWideChar; var attrs: PLDAPModW;
   var ServerControls, ClientControls: PLDAPControlW;
   var MessageNumber: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_add_ext}
-function ldap_add_ext(ld: PLDAP; dn: PChar; var attrs: PLDAPMod;
+function ldap_add_ext(ld: PLDAP; dn: PAnsiChar; var attrs: PLDAPMod;
   var ServerControls, ClientControls: PLDAPControl;
   var MessageNumber: ULONG): ULONG; cdecl;
 
@@ -1413,7 +1413,7 @@ function ldap_add_ext_sA(ld: PLDAP; dn: PAnsiChar; var attrs: PLDAPModA;
 function ldap_add_ext_sW(ld: PLDAP; dn: PWideChar; var attrs: PLDAPModW;
   var ServerControls, ClientControls: PLDAPControlW): ULONG; cdecl;
 {$EXTERNALSYM ldap_add_ext_s}
-function ldap_add_ext_s(ld: PLDAP; dn: PChar; var attrs: PLDAPMod;
+function ldap_add_ext_s(ld: PLDAP; dn: PAnsiChar; var attrs: PLDAPMod;
   var ServerControls, ClientControls: PLDAPControl): ULONG; cdecl;
 
 //
@@ -1425,14 +1425,14 @@ function ldap_compareA(ld: PLDAP; dn, attr, value: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_compareW}
 function ldap_compareW(ld: PLDAP; dn, attr, value: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_compare}
-function ldap_compare(ld: PLDAP; dn, attr, value: PChar): ULONG; cdecl;
+function ldap_compare(ld: PLDAP; dn, attr, value: PAnsiChar): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_compare_sA}
 function ldap_compare_sA(ld: PLDAP; dn, attr, value: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_compare_sW}
 function ldap_compare_sW(ld: PLDAP; dn, attr, value: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_compare_s}
-function ldap_compare_s(ld: PLDAP; dn, attr, value: PChar): ULONG; cdecl;
+function ldap_compare_s(ld: PLDAP; dn, attr, value: PAnsiChar): ULONG; cdecl;
 
 //
 //  Extended Compare operations.  These take controls and are thread safe.
@@ -1454,7 +1454,7 @@ function ldap_compare_extW(ld: PLDAP; dn, Attr, Value: PWideChar;
   Data: PLDAPBerVal; var ServerControls, ClientControls: PLDAPControlW;
   var MessageNumber: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_compare_ext}
-function ldap_compare_ext(ld: PLDAP; dn, Attr, Value: PChar;
+function ldap_compare_ext(ld: PLDAP; dn, Attr, Value: PAnsiChar;
   Data: PLDAPBerVal; var ServerControls, ClientControls: PLDAPControl;
   var MessageNumber: ULONG): ULONG; cdecl;
 
@@ -1468,7 +1468,7 @@ function ldap_compare_ext_sW(ld: PLDAP;
   var ServerControls, ClientControls: PLDAPControlW): ULONG; cdecl;
 {$EXTERNALSYM ldap_compare_ext_s}
 function ldap_compare_ext_s(ld: PLDAP;
-  dn, Attr, Value: PChar; Data: PLDAPBerVal;
+  dn, Attr, Value: PAnsiChar; Data: PLDAPBerVal;
   var ServerControls, ClientControls: PLDAPControl): ULONG; cdecl;
 
 //
@@ -1491,14 +1491,14 @@ function ldap_deleteA(ld: PLDAP; dn: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_deleteW}
 function ldap_deleteW(ld: PLDAP; dn: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_delete}
-function ldap_delete(ld: PLDAP; dn: PChar): ULONG; cdecl;
+function ldap_delete(ld: PLDAP; dn: PAnsiChar): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_delete_sA}
 function ldap_delete_sA(ld: PLDAP; dn: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_delete_sW}
 function ldap_delete_sW(ld: PLDAP; dn: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_delete_s}
-function ldap_delete_s(ld: PLDAP; dn: PChar): ULONG; cdecl;
+function ldap_delete_s(ld: PLDAP; dn: PAnsiChar): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_delete_extA}
 function ldap_delete_extA(ld: PLDAP; dn: PAnsiChar;
@@ -1509,7 +1509,7 @@ function ldap_delete_extW(ld: PLDAP; dn: PWideChar;
   var ServerControls, ClientControls: PLDAPControlW;
   var MessageNumber: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_delete_ext}
-function ldap_delete_ext(ld: PLDAP; dn: PChar;
+function ldap_delete_ext(ld: PLDAP; dn: PAnsiChar;
   var ServerControls, ClientControls: PLDAPControl;
   var MessageNumber: ULONG): ULONG; cdecl;
 
@@ -1520,7 +1520,7 @@ function ldap_delete_ext_sA(ld: PLDAP; dn: PAnsiChar;
 function ldap_delete_ext_sW(ld: PLDAP; dn: PWideChar;
   var ServerControls, ClientControls: PLDAPControlW): ULONG; cdecl;
 {$EXTERNALSYM ldap_delete_ext_s}
-function ldap_delete_ext_s(ld: PLDAP; dn: PChar;
+function ldap_delete_ext_s(ld: PLDAP; dn: PAnsiChar;
   var ServerControls, ClientControls: PLDAPControl): ULONG; cdecl;
 
 //
@@ -1608,9 +1608,9 @@ function ldap_parse_result (
         var Connection: LDAP;
         ResultMessage: PLDAPMessage;
         ReturnCode: PULONG;                     // returned by server
-        MatchedDNs: PPChar;                    // free with ldap_memfree
-        ErrorMessage: PPChar;                  // free with ldap_memfree
-        Referrals: PPPChar;                    // free with ldap_value_freeW
+        MatchedDNs: PPAnsiChar;                    // free with ldap_memfree
+        ErrorMessage: PPAnsiChar;                  // free with ldap_memfree
+        Referrals: PPPAnsiChar;                    // free with ldap_value_freeW
         var ServerControls: PPLDAPControl;     // free with ldap_free_controlsW
         Freeit: BOOL): ULONG; cdecl;
 
@@ -1641,7 +1641,7 @@ function ldap_parse_extended_resultW(
 function ldap_parse_extended_result(
   Connection: PLDAP;
   ResultMessage: PLDAPMessage;          // returned by server
-  var ResultOID: PChar;             // free with ldap_memfree
+  var ResultOID: PAnsiChar;             // free with ldap_memfree
   var ResultData: PBERVAL;              // free with ldap_memfree
   Freeit: ByteBool                      // Don't need the message anymore
 ): ULONG; cdecl;
@@ -1674,14 +1674,14 @@ function ldap_err2stringA(err: ULONG): PAnsiChar; cdecl;
 {$EXTERNALSYM ldap_err2stringW}
 function ldap_err2stringW(err: ULONG): PWideChar; cdecl;
 {$EXTERNALSYM ldap_err2string}
-function ldap_err2string(err: ULONG): PChar; cdecl;
+function ldap_err2string(err: ULONG): PAnsiChar; cdecl;
 
 //
 //  ldap_perror does nothing and is here just for compatibility.
 //
 
 {$EXTERNALSYM ldap_perror}
-procedure ldap_perror(ld: PLDAP; msg: PChar); cdecl;
+procedure ldap_perror(ld: PLDAP; msg: PAnsiChar); cdecl;
 
 //
 //  Return the first entry of a message.  It is freed when the message is
@@ -1715,7 +1715,7 @@ type
   PBerElement = ^BerElement;
   {$EXTERNALSYM BerElement}
   BerElement = record
-    opaque: PChar;      // this is an opaque structure used just for
+    opaque: PAnsiChar;      // this is an opaque structure used just for
                         // compatibility with reference implementation
   end;
 
@@ -1737,7 +1737,7 @@ function ldap_first_attributeW(ld: PLDAP; entry: PLDAPMessage;
   var ptr: PBerElement): PWideChar; cdecl;
 {$EXTERNALSYM ldap_first_attribute}
 function ldap_first_attribute(ld: PLDAP; entry: PLDAPMessage;
-  var ptr: PBerElement): PChar; cdecl;
+  var ptr: PBerElement): PAnsiChar; cdecl;
 
 //
 //  Return the next attribute... again, the attribute pointer should not be
@@ -1752,7 +1752,7 @@ function ldap_next_attributeW(ld: PLDAP; entry: PLDAPMessage;
   ptr: PBerElement): PWideChar; cdecl;
 {$EXTERNALSYM ldap_next_attribute}
 function ldap_next_attribute(ld: PLDAP; entry: PLDAPMessage;
-  ptr: PBerElement): PChar; cdecl;
+  ptr: PBerElement): PAnsiChar; cdecl;
 
 //
 //  Get a given attribute's list of values.  This is used during parsing of
@@ -1774,7 +1774,7 @@ function ldap_get_valuesW(ld: PLDAP; entry: PLDAPMessage;
   attr: PWideChar): PPCharW; cdecl;
 {$EXTERNALSYM ldap_get_values}
 function ldap_get_values(ld: PLDAP; entry: PLDAPMessage;
-  attr: PChar): PPChar; cdecl;
+  attr: PAnsiChar): PPAnsiChar; cdecl;
 
 //
 //  Get a given attribute's list of values.  This is used during parsing of
@@ -1796,7 +1796,7 @@ function ldap_get_values_lenW(ExternalHandle: PLDAP; Message: PLDAPMessage;
  attr: PWideChar): PPLDAPBerVal; cdecl;
 {$EXTERNALSYM ldap_get_values_len}
 function ldap_get_values_len(ExternalHandle: PLDAP; Message: PLDAPMessage;
- attr: PChar): PPLDAPBerVal; cdecl;
+ attr: PAnsiChar): PPLDAPBerVal; cdecl;
 
 //
 //  Return the number of values in a list returned by ldap_get_values.
@@ -1807,7 +1807,7 @@ function ldap_count_valuesA(vals: PPCharA): ULONG; cdecl;
 {$EXTERNALSYM ldap_count_valuesW}
 function ldap_count_valuesW(vals: PPCharW): ULONG; cdecl;
 {$EXTERNALSYM ldap_count_values}
-function ldap_count_values(vals: PPChar): ULONG; cdecl;
+function ldap_count_values(vals: PPAnsiChar): ULONG; cdecl;
 
 //
 //  Return the number of values in a list returned by ldap_get_values_len.
@@ -1825,7 +1825,7 @@ function ldap_value_freeA(vals: PPCharA): ULONG; cdecl;
 {$EXTERNALSYM ldap_value_freeW}
 function ldap_value_freeW(vals: PPCharW): ULONG; cdecl;
 {$EXTERNALSYM ldap_value_free}
-function ldap_value_free(vals: PPChar): ULONG; cdecl;
+function ldap_value_free(vals: PPAnsiChar): ULONG; cdecl;
 
 //
 //  Free structures returned by ldap_get_values_len.
@@ -1844,7 +1844,7 @@ function ldap_get_dnA(ld: PLDAP; entry: PLDAPMessage): PAnsiChar; cdecl;
 {$EXTERNALSYM ldap_get_dnW}
 function ldap_get_dnW(ld: PLDAP; entry: PLDAPMessage): PWideChar; cdecl;
 {$EXTERNALSYM ldap_get_dn}
-function ldap_get_dn(ld: PLDAP; entry: PLDAPMessage): PChar; cdecl;
+function ldap_get_dn(ld: PLDAP; entry: PLDAPMessage): PAnsiChar; cdecl;
 
 //
 //  When using ldap_explode_dn, you should free the returned string by
@@ -1856,7 +1856,7 @@ function ldap_explode_dnA(dn: PAnsiChar; notypes: ULONG): PPCharA; cdecl;
 {$EXTERNALSYM ldap_explode_dnW}
 function ldap_explode_dnW(dn: PWideChar; notypes: ULONG): PPCharW; cdecl;
 {$EXTERNALSYM ldap_explode_dn}
-function ldap_explode_dn(dn: PChar; notypes: ULONG): PPChar; cdecl;
+function ldap_explode_dn(dn: PAnsiChar; notypes: ULONG): PPAnsiChar; cdecl;
 
 //
 //  When calling ldap_dn2ufn, you should free the returned string by calling
@@ -1868,7 +1868,7 @@ function ldap_dn2ufnA(dn: PAnsiChar): PAnsiChar; cdecl;
 {$EXTERNALSYM ldap_dn2ufnW}
 function ldap_dn2ufnW(dn: PWideChar): PWideChar; cdecl;
 {$EXTERNALSYM ldap_dn2ufn}
-function ldap_dn2ufn(dn: PChar): PChar; cdecl;
+function ldap_dn2ufn(dn: PAnsiChar): PAnsiChar; cdecl;
 
 //
 //  This is used to free strings back to the LDAP API heap.  Don't pass in
@@ -1880,7 +1880,7 @@ procedure ldap_memfreeA(Block: PAnsiChar); cdecl;
 {$EXTERNALSYM ldap_memfreeW}
 procedure ldap_memfreeW(Block: PWideChar); cdecl;
 {$EXTERNALSYM ldap_memfree}
-procedure ldap_memfree(Block: PChar); cdecl;
+procedure ldap_memfree(Block: PAnsiChar); cdecl;
 
 {$EXTERNALSYM ber_bvfree}
 procedure ber_bvfree(bv: PLDAPBerVal); cdecl;
@@ -1901,7 +1901,7 @@ function ldap_ufn2dnA(ufn: PAnsiChar; var pDn: PAnsiChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_ufn2dnW}
 function ldap_ufn2dnW(ufn: PWideChar; var pDn: PWideChar): ULONG; cdecl;
 {$EXTERNALSYM ldap_ufn2dn}
-function ldap_ufn2dn(ufn: PChar; var pDn: PChar): ULONG; cdecl;
+function ldap_ufn2dn(ufn: PAnsiChar; var pDn: PAnsiChar): ULONG; cdecl;
 
 const
   {$EXTERNALSYM LBER_USE_DER}
@@ -1977,16 +1977,16 @@ function ldap_cleanup(hInstance: THandle): ULONG; cdecl;
 
 {$EXTERNALSYM ldap_escape_filter_elementA}
 function ldap_escape_filter_elementA(
-  sourceFilterElement: PChar; sourceLength: ULONG;
+  sourceFilterElement: PAnsiChar; sourceLength: ULONG;
   destFilterElement: PAnsiChar; destLength: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_escape_filter_elementW}
 function ldap_escape_filter_elementW(
-  sourceFilterElement: PChar; sourceLength: ULONG;
+  sourceFilterElement: PAnsiChar; sourceLength: ULONG;
   destFilterElement: PWideChar; destLength: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_escape_filter_element}
 function ldap_escape_filter_element(
-  sourceFilterElement: PChar; sourceLength: ULONG;
-  destFilterElement: PChar; destLength: ULONG): ULONG; cdecl;
+  sourceFilterElement: PAnsiChar; sourceLength: ULONG;
+  destFilterElement: PAnsiChar; destLength: ULONG): ULONG; cdecl;
 
 //
 //  Misc extensions for additional debugging.
@@ -2005,7 +2005,7 @@ function ldap_set_dbg_flags(NewFlags: ULONG): ULONG; cdecl;
 
 type
   {$EXTERNALSYM DBGPRINT}
-  DBGPRINT = function(Format: PChar {; ...} ): ULONG cdecl;
+  DBGPRINT = function(Format: PAnsiChar {; ...} ): ULONG cdecl;
   TDbgPrint = DBGPRINT;
 
 {$EXTERNALSYM ldap_set_dbg_routine}
@@ -2119,7 +2119,7 @@ function ldap_parse_sort_controlW(ExternalHandle: PLDAP;
 {$EXTERNALSYM ldap_parse_sort_control}
 function ldap_parse_sort_control(ExternalHandle: PLDAP;
   var Control: PLDAPControl; var Result: ULONG;
-  var Attribute: PChar): ULONG; cdecl;
+  var Attribute: PAnsiChar): ULONG; cdecl;
 
 //
 //  This API formats a list of sort keys into a search control.  Call
@@ -2231,8 +2231,8 @@ function ldap_search_init_pageW(ExternalHandle: PLDAP;
 
 {$EXTERNALSYM ldap_search_init_page}
 function ldap_search_init_page(ExternalHandle: PLDAP;
-  DistinguishedName: PChar; ScopeOfSearch: ULONG; SearchFilter: PChar;
-  AttributeList: PPChar; AttributesOnly: ULONG;
+  DistinguishedName: PAnsiChar; ScopeOfSearch: ULONG; SearchFilter: PAnsiChar;
+  AttributeList: PPAnsiChar; AttributesOnly: ULONG;
   var ServerControls, ClientControls: PLDAPControl;
   PageTimeLimit, TotalSizeLimit: ULONG;
   var SortKeys: PLDAPSortKey): PLDAPSearch; cdecl;
@@ -2303,7 +2303,7 @@ function ldap_parse_referenceW(Connection: PLDAP; ResultMessage: PLDAPMessage;
   var Referrals: PPCharW): ULONG; cdecl;
 {$EXTERNALSYM ldap_parse_reference}
 function ldap_parse_reference(Connection: PLDAP; ResultMessage: PLDAPMessage;
-  var Referrals: PPChar): ULONG; cdecl;
+  var Referrals: PPAnsiChar): ULONG; cdecl;
 
 //
 //  These APIs allow a client to send an extended request (free for all) to
@@ -2324,7 +2324,7 @@ function ldap_extended_operationW(ld: PLDAP; Oid: PWideChar;
   var Data: TLDAPBerVal; var ServerControls, ClientControls: PLDAPControlW;
   var MessageNumber: ULONG): ULONG; cdecl;
 {$EXTERNALSYM ldap_extended_operation}
-function ldap_extended_operation(ld: PLDAP; Oid: PChar;
+function ldap_extended_operation(ld: PLDAP; Oid: PAnsiChar;
   var Data: TLDAPBerVal; var ServerControls, ClientControls: PLDAPControl;
   var MessageNumber: ULONG): ULONG; cdecl;
 
@@ -2367,7 +2367,7 @@ type
     PrimaryConnection: PLDAP;
     ReferralFromConnection: PLDAP;
     NewDN: PWideChar;
-    HostName: PChar;
+    HostName: PAnsiChar;
     PortNumber: ULONG;
     SecAuthIdentity: Pointer;    // if null, use CurrentUser below
     CurrentUserToken: Pointer;   // pointer to current user's LUID
@@ -2392,7 +2392,7 @@ type
     PrimaryConnection: PLDAP;
     ReferralFromConnection: PLDAP;
     NewDN: PWideChar;
-    HostName: PChar;
+    HostName: PAnsiChar;
     NewConnection: PLDAP;
     PortNumber: ULONG;
     SecAuthIdentity: Pointer;    // if null, use CurrentUser below

packages/winunits-jedi/src/jwawinnls.pas

@@ -101,7 +101,7 @@ const
   {$EXTERNALSYM WC_DISCARDNS}
   WC_SEPCHARS       = $00000020; // generate separate chars
   {$EXTERNALSYM WC_SEPCHARS}
-  WC_DEFAULTCHAR    = $00000040; // replace w/ default char
+  WC_DEFAULTCHAR    = $00000040; // replace w/ default AnsiChar
   {$EXTERNALSYM WC_DEFAULTCHAR}
 
   WC_NO_BEST_FIT_CHARS = $00000400; // do not use best fit chars
@@ -203,7 +203,7 @@ const
   C3_LEXICAL   = $0400; // lexical character
   {$EXTERNALSYM C3_LEXICAL}
 
-  C3_ALPHA = $8000; // any linguistic char (C1_ALPHA)
+  C3_ALPHA = $8000; // any linguistic AnsiChar (C1_ALPHA)
   {$EXTERNALSYM C3_ALPHA}
 
   C3_NOTAPPLICABLE = $0000; // ctype 3 is not applicable
@@ -1149,7 +1149,7 @@ type
   LPCPINFO = ^CPINFO;
   {$EXTERNALSYM LPCPINFO}
   _cpinfo = record
-    MaxCharSize: UINT; // max length (in bytes) of a char
+    MaxCharSize: UINT; // max length (in bytes) of a AnsiChar
     DefaultChar: array [0..MAX_DEFAULTCHAR - 1] of BYTE; // default character
     LeadByte: array [0..MAX_LEADBYTES - 1] of BYTE; // lead byte ranges
   end;
@@ -1162,12 +1162,12 @@ type
   {$EXTERNALSYM CPINFOEXA}
   LPCPINFOEXA = ^CPINFOEXA;
   _cpinfoexA = record
-    MaxCharSize: UINT; // max length (in bytes) of a char
+    MaxCharSize: UINT; // max length (in bytes) of a AnsiChar
     DefaultChar: array [0..MAX_DEFAULTCHAR - 1] of BYTE; // default character (MB)
     LeadByte: array [0..MAX_LEADBYTES - 1] of BYTE; // lead byte ranges
     UnicodeDefaultChar: WCHAR; // default character (Unicode)
     CodePage: UINT; // code page id
-    CodePageName: array [0..MAX_PATH - 1] of CHAR; // code page name (Unicode)
+    CodePageName: array [0..MAX_PATH - 1] of AnsiChar; // code page name (Unicode)
   end;
   {$EXTERNALSYM _cpinfoexA}
   CPINFOEXA = _cpinfoexA;
@@ -1178,7 +1178,7 @@ type
   LPCPINFOEXW = ^CPINFOEXW;
   {$EXTERNALSYM LPCPINFOEXW}
   _cpinfoexW = record
-    MaxCharSize: UINT; // max length (in bytes) of a char
+    MaxCharSize: UINT; // max length (in bytes) of a AnsiChar
     DefaultChar: array [0..MAX_DEFAULTCHAR - 1] of BYTE; // default character (MB)
     LeadByte: array [0..MAX_LEADBYTES - 1] of BYTE; // lead byte ranges
     UnicodeDefaultChar: WCHAR; // default character (Unicode)

packages/winunits-jedi/src/jwawinnt.pas

@@ -2769,7 +2769,7 @@ type
   PTOKEN_SOURCE = ^TOKEN_SOURCE;
   {$EXTERNALSYM PTOKEN_SOURCE}
   _TOKEN_SOURCE = record
-    SourceName: array [0..TOKEN_SOURCE_LENGTH - 1] of CHAR;
+    SourceName: array [0..TOKEN_SOURCE_LENGTH - 1] of AnsiChar;
     SourceIdentifier: LUID;
   end;
   {$EXTERNALSYM _TOKEN_SOURCE}
@@ -4594,8 +4594,8 @@ type
   {$EXTERNALSYM PIMAGE_OS2_HEADER}
   _IMAGE_OS2_HEADER = record
     ne_magic: Word;        // Magic number
-    ne_ver: CHAR;          // Version number
-    ne_rev: CHAR;          // Revision number
+    ne_ver: AnsiChar;          // Version number
+    ne_rev: AnsiChar;          // Revision number
     ne_enttab: Word;       // Offset of Entry Table
     ne_cbenttab: Word;     // Number of bytes in Entry Table
     ne_crc: Longint;       // Checksum of whole file
@@ -6597,7 +6597,7 @@ type
   {$EXTERNALSYM PIMAGE_RESOURCE_DIRECTORY_STRING}
   _IMAGE_RESOURCE_DIRECTORY_STRING = record
     Length: Word;
-    NameString: array [0..0] of CHAR;
+    NameString: array [0..0] of AnsiChar;
   end;
   {$EXTERNALSYM _IMAGE_RESOURCE_DIRECTORY_STRING}
   IMAGE_RESOURCE_DIRECTORY_STRING = _IMAGE_RESOURCE_DIRECTORY_STRING;
@@ -7351,7 +7351,7 @@ type
     dwMinorVersion: DWORD;
     dwBuildNumber: DWORD;
     dwPlatformId: DWORD;
-    szCSDVersion: array [0..127] of CHAR; // Maintenance string for PSS usage
+    szCSDVersion: array [0..127] of AnsiChar; // Maintenance string for PSS usage
   end;
   {$EXTERNALSYM _OSVERSIONINFOA}
   OSVERSIONINFOA = _OSVERSIONINFOA;
@@ -7402,7 +7402,7 @@ type
     dwMinorVersion: DWORD;
     dwBuildNumber: DWORD;
     dwPlatformId: DWORD;
-    szCSDVersion: array [0..127] of CHAR;     // Maintenance string for PSS usage
+    szCSDVersion: array [0..127] of AnsiChar;     // Maintenance string for PSS usage
     wServicePackMajor: WORD;
     wServicePackMinor: WORD;
     wSuiteMask: WORD;
@@ -7611,7 +7611,7 @@ type
   PRTL_VERIFIER_THUNK_DESCRIPTOR = ^RTL_VERIFIER_THUNK_DESCRIPTOR;
   {$EXTERNALSYM PRTL_VERIFIER_THUNK_DESCRIPTOR}
   _RTL_VERIFIER_THUNK_DESCRIPTOR = record
-    ThunkName: PCHAR;
+    ThunkName: PAnsiChar;
     ThunkOldAddress: PVOID;
     ThunkNewAddress: PVOID;
   end;
@@ -7859,11 +7859,11 @@ const
 VOID NTAPI
 RtlApplicationVerifierStop (
     ULONG_PTR Code,
-    PCHAR Message,
-    ULONG_PTR Param1, PCHAR Description1,
-    ULONG_PTR Param2, PCHAR Description2,
-    ULONG_PTR Param3, PCHAR Description3,
-    ULONG_PTR Param4, PCHAR Description4
+    PAnsiChar Message,
+    ULONG_PTR Param1, PAnsiChar Description1,
+    ULONG_PTR Param2, PAnsiChar Description2,
+    ULONG_PTR Param3, PAnsiChar Description3,
+    ULONG_PTR Param4, PAnsiChar Description4
     );
 *)
 
@@ -8197,7 +8197,7 @@ type
     // SID   UserSid
     // WCHAR Strings[]
     // BYTE  Data[]
-    // CHAR  Pad[]
+    // AnsiChar  Pad[]
     // DWORD Length;
     //
   end;

packages/winunits-jedi/src/jwawinperf.pas

@@ -797,7 +797,7 @@ type
     NameLength: DWORD;                  // Length in bytes of name; 0 = none
                                         // this length includes the characters
                                         // in the string plus the size of the
-                                        // terminating NULL char. It does not
+                                        // terminating NULL AnsiChar. It does not
                                         // include any additional pad bytes to
                                         // correct structure alignment
   end;

packages/winunits-jedi/src/jwawinsock.pas

@@ -213,13 +213,13 @@ const
 
 type
   hostent = record
-    h_name: PChar;           // official name of host
-    h_aliases: PPChar;  // alias list
+    h_name: PAnsiChar;           // official name of host
+    h_aliases: PPAnsiChar;  // alias list
     h_addrtype: Smallint;             // host address type
     h_length: Smallint;               // length of address
     case Integer of
-      0: (h_addr_list: PPChar); // list of addresses
-      1: (h_addr: PPChar);          // address, for backward compat
+      0: (h_addr_list: PPAnsiChar); // list of addresses
+      1: (h_addr: PPAnsiChar);          // address, for backward compat
   end;
   {$EXTERNALSYM hostent}
   THostEnt = hostent;
@@ -232,8 +232,8 @@ type
 
 type
   netent = record
-    n_name: PChar;           // official name of net
-    n_aliases: PPChar;  // alias list
+    n_name: PAnsiChar;           // official name of net
+    n_aliases: PPAnsiChar;  // alias list
     n_addrtype: Smallint;             // net address type
     n_net: u_long;                  // network #
   end;
@@ -242,18 +242,18 @@ type
   PNetEnt = ^netent;
 
   servent = record
-    s_name: PChar;           // official service name
-    s_aliases: PPChar;  // alias list
+    s_name: PAnsiChar;           // official service name
+    s_aliases: PPAnsiChar;  // alias list
     s_port: Smallint;                 // port #
-    s_proto: PChar;          // protocol to use
+    s_proto: PAnsiChar;          // protocol to use
   end;
   {$EXTERNALSYM servent}
   TServEnt = servent;
   PServEnt = ^servent;
 
   protoent = record
-    p_name: PChar;           // official protocol name
-    p_aliases: PPChar;  // alias list
+    p_name: PAnsiChar;           // official protocol name
+    p_aliases: PPAnsiChar;  // alias list
     p_proto: Smallint;                // protocol #
   end;
   {$EXTERNALSYM protoent}
@@ -476,7 +476,7 @@ type
     sin_family: Smallint;
     sin_port: u_short;
     sin_addr: in_addr;
-    sin_zero: array [0..7] of Char;
+    sin_zero: array [0..7] of AnsiChar;
   end;
   {$EXTERNALSYM sockaddr_in}
   TSockAddrIn = sockaddr_in;
@@ -492,11 +492,11 @@ type
   WSAData = record
     wVersion: WORD;
     wHighVersion: WORD;
-    szDescription: array [0..WSADESCRIPTION_LEN] of Char;
-    szSystemStatus: array [0..WSASYS_STATUS_LEN] of Char;
+    szDescription: array [0..WSADESCRIPTION_LEN] of AnsiChar;
+    szSystemStatus: array [0..WSASYS_STATUS_LEN] of AnsiChar;
     iMaxSockets: Word;
     iMaxUdpDg: Word;
-    lpVendorInfo: PChar;
+    lpVendorInfo: PAnsiChar;
   end;
   {$EXTERNALSYM WSAData}
   LPWSADATA = ^WSAData;
@@ -746,7 +746,7 @@ const
 type
   sockaddr = record
     sa_family: u_short;              // address family
-    sa_data: array [0..13] of Char;            // up to 14 bytes of direct address
+    sa_data: array [0..13] of AnsiChar;            // up to 14 bytes of direct address
   end;
   {$EXTERNALSYM sockaddr}
   TSockAddr = sockaddr;
@@ -1166,15 +1166,15 @@ function getpeername(s: TSocket; name: PSockAddr; var namelen: Integer): Integer
 {$EXTERNALSYM getpeername}
 function getsockname(s: TSocket; name: PSockAddr; var namelen: Integer): Integer; stdcall;
 {$EXTERNALSYM getsockname}
-function getsockopt(s: TSocket; level, optname: Integer; optval: PChar; var optlen: Integer): Integer; stdcall;
+function getsockopt(s: TSocket; level, optname: Integer; optval: PAnsiChar; var optlen: Integer): Integer; stdcall;
 {$EXTERNALSYM getsockopt}
 function htonl(hostlong: u_long): u_long; stdcall;
 {$EXTERNALSYM htonl}
 function htons(hostshort: u_short): u_short; stdcall;
 {$EXTERNALSYM htons}
-function inet_addr(cp: PChar): u_long; stdcall;
+function inet_addr(cp: PAnsiChar): u_long; stdcall;
 {$EXTERNALSYM inet_addr}
-function inet_ntoa(inaddr: in_addr): PChar; stdcall;
+function inet_ntoa(inaddr: in_addr): PAnsiChar; stdcall;
 {$EXTERNALSYM inet_ntoa}
 function listen(s: TSocket; backlog: Integer): Integer; stdcall;
 {$EXTERNALSYM listen}
@@ -1192,7 +1192,7 @@ function send(s: TSocket; var buf; len, flags: Integer): Integer; stdcall;
 {$EXTERNALSYM send}
 function sendto(s: TSocket; var buf; len, flags: Integer; toaddr: PSockAddr; tolen: Integer): Integer; stdcall;
 {$EXTERNALSYM sendto}
-function setsockopt(s: TSocket; level, optname: Integer; optval: PChar; optlen: Integer): Integer; stdcall;
+function setsockopt(s: TSocket; level, optname: Integer; optval: PAnsiChar; optlen: Integer): Integer; stdcall;
 {$EXTERNALSYM setsockopt}
 function shutdown(s: TSocket; how: Integer): Integer; stdcall;
 {$EXTERNALSYM shutdown}
@@ -1201,19 +1201,19 @@ function socket(af, type_, protocol: Integer): TSocket; stdcall;
 
 (* Database function prototypes *)
 
-function gethostbyaddr(addr: PChar; len, type_: Integer): PHostEnt; stdcall;
+function gethostbyaddr(addr: PAnsiChar; len, type_: Integer): PHostEnt; stdcall;
 {$EXTERNALSYM gethostbyaddr}
-function gethostbyname(name: PChar): PHostEnt; stdcall;
+function gethostbyname(name: PAnsiChar): PHostEnt; stdcall;
 {$EXTERNALSYM gethostbyname}
-function gethostname(name: PChar; namelen: Integer): Integer; stdcall;
+function gethostname(name: PAnsiChar; namelen: Integer): Integer; stdcall;
 {$EXTERNALSYM gethostname}
-function getservbyport(port: Integer; proto: PChar): PServEnt; stdcall;
+function getservbyport(port: Integer; proto: PAnsiChar): PServEnt; stdcall;
 {$EXTERNALSYM getservbyport}
-function getservbyname(name, proto: PChar): PServEnt; stdcall;
+function getservbyname(name, proto: PAnsiChar): PServEnt; stdcall;
 {$EXTERNALSYM getservbyname}
 function getprotobynumber(number: Integer): PProtoEnt; stdcall;
 {$EXTERNALSYM getprotobynumber}
-function getprotobyname(name: PChar): PProtoEnt; stdcall;
+function getprotobyname(name: PAnsiChar): PProtoEnt; stdcall;
 {$EXTERNALSYM getprotobyname}
 
 (* Microsoft Windows Extension function prototypes *)
@@ -1234,23 +1234,23 @@ function WSASetBlockingHook(lpBlockFunc: FARPROC): FARPROC; stdcall;
 {$EXTERNALSYM WSASetBlockingHook}
 function WSACancelBlockingCall: Integer; stdcall;
 {$EXTERNALSYM WSACancelBlockingCall}
-function WSAAsyncGetServByName(hWnd: HWND; wMsg: u_int; name, proto, buf: PChar;
+function WSAAsyncGetServByName(hWnd: HWND; wMsg: u_int; name, proto, buf: PAnsiChar;
   buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetServByName}
 function WSAAsyncGetServByPort(hWnd: HWND; wMsg: u_int; port: Integer;
-  proto, buf: PChar; buflen: Integer): HANDLE; stdcall;
+  proto, buf: PAnsiChar; buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetServByPort}
-function WSAAsyncGetProtoByName(hWnd: HWND; wMsg: u_int; name, buf: PChar;
+function WSAAsyncGetProtoByName(hWnd: HWND; wMsg: u_int; name, buf: PAnsiChar;
   buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetProtoByName}
 function WSAAsyncGetProtoByNumber(hWnd: HWND; wMsg: u_int; number: Integer;
-  buf: PChar; buflen: Integer): HANDLE; stdcall;
+  buf: PAnsiChar; buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetProtoByNumber}
-function WSAAsyncGetHostByName(hWnd: HWND; wMsg: u_int; name, buf: PChar;
+function WSAAsyncGetHostByName(hWnd: HWND; wMsg: u_int; name, buf: PAnsiChar;
   buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetHostByName}
-function WSAAsyncGetHostByAddr(hWnd: HWND; wMsg: u_int; addr: PChar;
-  len, type_: Integer; buf: PChar; buflen: Integer): HANDLE; stdcall;
+function WSAAsyncGetHostByAddr(hWnd: HWND; wMsg: u_int; addr: PAnsiChar;
+  len, type_: Integer; buf: PAnsiChar; buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetHostByAddr}
 function WSACancelAsyncRequest(hAsyncTaskHandle: HANDLE): Integer; stdcall;
 {$EXTERNALSYM WSACancelAsyncRequest}

packages/winunits-jedi/src/jwawinsock2.pas

@@ -245,13 +245,13 @@ const
 
 type
   hostent = record
-    h_name: PChar;           // official name of host
-    h_aliases: PPChar;  // alias list
+    h_name: PAnsiChar;           // official name of host
+    h_aliases: PPAnsiChar;  // alias list
     h_addrtype: Smallint;             // host address type
     h_length: Smallint;               // length of address
     case Integer of
-      0: (h_addr_list: PPChar); // list of addresses
-      1: (h_addr: PPChar);          // address, for backward compat
+      0: (h_addr_list: PPAnsiChar); // list of addresses
+      1: (h_addr: PPAnsiChar);          // address, for backward compat
   end;
   {$EXTERNALSYM hostent}
   THostEnt = hostent;
@@ -264,8 +264,8 @@ type
 
 type
   netent = record
-    n_name: PChar;           // official name of net
-    n_aliases: PPChar;  // alias list
+    n_name: PAnsiChar;           // official name of net
+    n_aliases: PPAnsiChar;  // alias list
     n_addrtype: Smallint;             // net address type
     n_net: u_long;                  // network #
   end;
@@ -274,18 +274,18 @@ type
   PNetEnt = ^netent;
 
   servent = record
-    s_name: PChar;           // official service name
-    s_aliases: PPChar;  // alias list
+    s_name: PAnsiChar;           // official service name
+    s_aliases: PPAnsiChar;  // alias list
     s_port: Smallint;                 // port #
-    s_proto: PChar;          // protocol to use
+    s_proto: PAnsiChar;          // protocol to use
   end;
   {$EXTERNALSYM servent}
   TServEnt = servent;
   PServEnt = ^servent;
 
   protoent = record
-    p_name: PChar;           // official protocol name
-    p_aliases: PPChar;  // alias list
+    p_name: PAnsiChar;           // official protocol name
+    p_aliases: PPAnsiChar;  // alias list
     p_proto: Smallint;                // protocol #
   end;
   {$EXTERNALSYM protoent}
@@ -448,7 +448,7 @@ type
   {$EXTERNALSYM SunB}
 
   SunC = packed record
-    s_c1, s_c2, s_c3, s_c4: Char;
+    s_c1, s_c2, s_c3, s_c4: AnsiChar;
   end;
   {$NODEFINE SunC}
 
@@ -553,7 +553,7 @@ type
     sin_family: Smallint;
     sin_port: u_short;
     sin_addr: in_addr;
-    sin_zero: array [0..7] of Char;
+    sin_zero: array [0..7] of AnsiChar;
   end;
   {$EXTERNALSYM sockaddr_in}
   TSockAddrIn = sockaddr_in;
@@ -569,11 +569,11 @@ type
   WSAData = record
     wVersion: WORD;
     wHighVersion: WORD;
-    szDescription: array [0..WSADESCRIPTION_LEN] of Char;
-    szSystemStatus: array [0..WSASYS_STATUS_LEN] of Char;
+    szDescription: array [0..WSADESCRIPTION_LEN] of AnsiChar;
+    szSystemStatus: array [0..WSASYS_STATUS_LEN] of AnsiChar;
     iMaxSockets: Word;
     iMaxUdpDg: Word;
-    lpVendorInfo: PChar;
+    lpVendorInfo: PAnsiChar;
   end;
   {$EXTERNALSYM WSAData}
   LPWSADATA = ^WSAData;
@@ -803,7 +803,7 @@ const
 type
   sockaddr = record
     sa_family: u_short;              // address family
-    sa_data: array [0..13] of Char;            // up to 14 bytes of direct address
+    sa_data: array [0..13] of AnsiChar;            // up to 14 bytes of direct address
   end;
   {$EXTERNALSYM sockaddr}
   TSockAddr = sockaddr;
@@ -836,12 +836,12 @@ const
 type
   sockaddr_storage = record
     ss_family: short;               // Address family.
-    __ss_pad1: array [0.._SS_PAD1SIZE - 1] of char;  // 6 byte pad, this is to make
+    __ss_pad1: array [0.._SS_PAD1SIZE - 1] of AnsiChar;  // 6 byte pad, this is to make
                                    // implementation specific pad up to
                                    // alignment field that follows explicit
                                    // in the data structure.
     __ss_align: Int64;            // Field to force desired structure.
-    __ss_pad2: array [0.._SS_PAD2SIZE - 1] of char;  // 112 byte pad to achieve desired size;
+    __ss_pad2: array [0.._SS_PAD2SIZE - 1] of AnsiChar;  // 112 byte pad to achieve desired size;
                                    // _SS_MAXSIZE value minus size of
                                    // ss_family, __ss_pad1, and
                                    // __ss_align fields is 112.
@@ -1434,7 +1434,7 @@ const
 type
   _WSABUF = record
     len: u_long;     // the length of the buffer
-    buf: PChar;      // the pointer to the buffer
+    buf: PAnsiChar;      // the pointer to the buffer
   end;
   {$EXTERNALSYM _WSABUF}
   WSABUF = _WSABUF;
@@ -1568,7 +1568,7 @@ type
     iSecurityScheme: Integer;
     dwMessageSize: DWORD;
     dwProviderReserved: DWORD;
-    szProtocol: array [0..WSAPROTOCOL_LEN] of Char;
+    szProtocol: array [0..WSAPROTOCOL_LEN] of AnsiChar;
   end;
   {$EXTERNALSYM _WSAPROTOCOL_INFOA}
   WSAPROTOCOL_INFOA = _WSAPROTOCOL_INFOA;
@@ -2411,15 +2411,15 @@ function getpeername(s: TSocket; name: PSockAddr; var namelen: Integer): Integer
 {$EXTERNALSYM getpeername}
 function getsockname(s: TSocket; name: PSockAddr; var namelen: Integer): Integer; stdcall;
 {$EXTERNALSYM getsockname}
-function getsockopt(s: TSocket; level, optname: Integer; optval: PChar; var optlen: Integer): Integer; stdcall;
+function getsockopt(s: TSocket; level, optname: Integer; optval: PAnsiChar; var optlen: Integer): Integer; stdcall;
 {$EXTERNALSYM getsockopt}
 function htonl(hostlong: u_long): u_long; stdcall;
 {$EXTERNALSYM htonl}
 function htons(hostshort: u_short): u_short; stdcall;
 {$EXTERNALSYM htons}
-function inet_addr(cp: PChar): u_long; stdcall;
+function inet_addr(cp: PAnsiChar): u_long; stdcall;
 {$EXTERNALSYM inet_addr}
-function inet_ntoa(inaddr: in_addr): PChar; stdcall;
+function inet_ntoa(inaddr: in_addr): PAnsiChar; stdcall;
 {$EXTERNALSYM inet_ntoa}
 function listen(s: TSocket; backlog: Integer): Integer; stdcall;
 {$EXTERNALSYM listen}
@@ -2437,7 +2437,7 @@ function send(s: TSocket; var buf; len, flags: Integer): Integer; stdcall;
 {$EXTERNALSYM send}
 function sendto(s: TSocket; var buf; len, flags: Integer; toaddr: PSockAddr; tolen: Integer): Integer; stdcall;
 {$EXTERNALSYM sendto}
-function setsockopt(s: TSocket; level, optname: Integer; optval: PChar; optlen: Integer): Integer; stdcall;
+function setsockopt(s: TSocket; level, optname: Integer; optval: PAnsiChar; optlen: Integer): Integer; stdcall;
 {$EXTERNALSYM setsockopt}
 function shutdown(s: TSocket; how: Integer): Integer; stdcall;
 {$EXTERNALSYM shutdown}
@@ -2446,19 +2446,19 @@ function socket(af, type_, protocol: Integer): TSocket; stdcall;
 
 // Database function prototypes
 
-function gethostbyaddr(addr: PChar; len, type_: Integer): PHostEnt; stdcall;
+function gethostbyaddr(addr: PAnsiChar; len, type_: Integer): PHostEnt; stdcall;
 {$EXTERNALSYM gethostbyaddr}
-function gethostbyname(name: PChar): PHostEnt; stdcall;
+function gethostbyname(name: PAnsiChar): PHostEnt; stdcall;
 {$EXTERNALSYM gethostbyname}
-function gethostname(name: PChar; namelen: Integer): Integer; stdcall;
+function gethostname(name: PAnsiChar; namelen: Integer): Integer; stdcall;
 {$EXTERNALSYM gethostname}
-function getservbyport(port: Integer; proto: PChar): PServEnt; stdcall;
+function getservbyport(port: Integer; proto: PAnsiChar): PServEnt; stdcall;
 {$EXTERNALSYM getservbyport}
-function getservbyname(name, proto: PChar): PServEnt; stdcall;
+function getservbyname(name, proto: PAnsiChar): PServEnt; stdcall;
 {$EXTERNALSYM getservbyname}
 function getprotobynumber(number: Integer): PProtoEnt; stdcall;
 {$EXTERNALSYM getprotobynumber}
-function getprotobyname(name: PChar): PProtoEnt; stdcall;
+function getprotobyname(name: PAnsiChar): PProtoEnt; stdcall;
 {$EXTERNALSYM getprotobyname}
 
 // Microsoft Windows Extension function prototypes
@@ -2479,23 +2479,23 @@ function WSASetBlockingHook(lpBlockFunc: FARPROC): FARPROC; stdcall;
 {$EXTERNALSYM WSASetBlockingHook}
 function WSACancelBlockingCall: Integer; stdcall;
 {$EXTERNALSYM WSACancelBlockingCall}
-function WSAAsyncGetServByName(hWnd: HWND; wMsg: u_int; name, proto, buf: PChar;
+function WSAAsyncGetServByName(hWnd: HWND; wMsg: u_int; name, proto, buf: PAnsiChar;
   buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetServByName}
 function WSAAsyncGetServByPort(hWnd: HWND; wMsg: u_int; port: Integer;
-  proto, buf: PChar; buflen: Integer): HANDLE; stdcall;
+  proto, buf: PAnsiChar; buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetServByPort}
-function WSAAsyncGetProtoByName(hWnd: HWND; wMsg: u_int; name, buf: PChar;
+function WSAAsyncGetProtoByName(hWnd: HWND; wMsg: u_int; name, buf: PAnsiChar;
   buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetProtoByName}
 function WSAAsyncGetProtoByNumber(hWnd: HWND; wMsg: u_int; number: Integer;
-  buf: PChar; buflen: Integer): HANDLE; stdcall;
+  buf: PAnsiChar; buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetProtoByNumber}
-function WSAAsyncGetHostByName(hWnd: HWND; wMsg: u_int; name, buf: PChar;
+function WSAAsyncGetHostByName(hWnd: HWND; wMsg: u_int; name, buf: PAnsiChar;
   buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetHostByName}
-function WSAAsyncGetHostByAddr(hWnd: HWND; wMsg: u_int; addr: PChar;
-  len, type_: Integer; buf: PChar; buflen: Integer): HANDLE; stdcall;
+function WSAAsyncGetHostByAddr(hWnd: HWND; wMsg: u_int; addr: PAnsiChar;
+  len, type_: Integer; buf: PAnsiChar; buflen: Integer): HANDLE; stdcall;
 {$EXTERNALSYM WSAAsyncGetHostByAddr}
 function WSACancelAsyncRequest(hAsyncTaskHandle: HANDLE): Integer; stdcall;
 {$EXTERNALSYM WSACancelAsyncRequest}

packages/winunits-jedi/src/jwawinsta.pas

@@ -298,7 +298,7 @@ function CalculateDiffTime(TimeLow: INT64; TimeHigh: INT64): INT64;
 function CalculateElapsedTime(lpFileTime: PFILETIME; var DiffTime: TDiffTime):
   Boolean; stdcall;
 
-function CpuTime2Str(ACPUTime: LARGE_INTEGER): string;
+function CpuTime2Str(ACPUTime: LARGE_INTEGER): Ansistring;
 
 function CurrentDateTimeString(out lpBuffer: PWideChar): Boolean; stdcall;
 
@@ -336,7 +336,7 @@ function FileTime2DateTime(FileTime: TFileTime): TDateTime;
 function GetUnknownString: PWideChar; stdcall;
 
 function GetWTSLogonIdleTime(hServer: Handle; SessionId: DWORD;
-  var sLogonTime: string; var sIdleTime: string): Boolean;
+  var sLogonTime: AnsiString; var sIdleTime: AnsiString): Boolean;
 
 // Helper function that inits the structure for you!
 procedure InitTermSrvCounterArray(
@@ -413,7 +413,7 @@ function WinStationGetProcessSid(hServer: Handle; dwPID: DWORD;
   BOOL; stdcall;
 
 function WinStationGetRemoteIPAddress(hServer: HANDLE; SessionId: DWORD;
-  var RemoteIPAddress: string; var Port: WORD): Boolean;
+  var RemoteIPAddress: Ansistring; var Port: WORD): Boolean;
 
 function WinStationGetTermSrvCountersValue(hServer: Handle;
   dwArraySize: DWORD; PCountersArray: PTERM_SRV_COUNTER_ARRAY): BOOL;
@@ -1092,7 +1092,7 @@ end;
 
 // This functions converts CPU times as returned by
 // TSystemProcesses structure to a string
-function CpuTime2Str(ACPUTime: LARGE_INTEGER): String;
+function CpuTime2Str(ACPUTime: LARGE_INTEGER): AnsiString;
 var SystemTime: TSystemTime;
 {$IFDEF COMPILER7_UP}
   FS: TFormatSettings;
@@ -1199,7 +1199,7 @@ begin
 end;
 
 function GetWTSLogonIdleTime(hServer: HANDLE; SessionId: DWORD;
-  var sLogonTime: string; var sIdleTime: string): Boolean;
+  var sLogonTime: ansistring; var sIdleTime: ansistring): Boolean;
 var
   uReturnLength: DWORD;
   Info: _WINSTATION_INFORMATIONW;
@@ -1326,7 +1326,7 @@ begin
 end;
 
 function WinStationGetRemoteIPAddress(hServer: HANDLE; SessionId: DWORD;
-  var RemoteIPAddress: string; var Port: WORD): Boolean;
+  var RemoteIPAddress: ansistring; var Port: WORD): Boolean;
 var WinStationRemoteIPAddress: TWinStationRemoteAddress;
   pReturnLength: DWORD;
 begin

packages/winunits-jedi/src/jwawinternl.pas

@@ -169,12 +169,12 @@ type
 type
   NTSTATUS = Longword;
 
-  PCSZ = PChar;
+  PCSZ = PAnsiChar;
 
   _STRING = record
     Length: USHORT;
     MaximumLength: USHORT;
-    Buffer: PChar;
+    Buffer: PAnsiChar;
   end;
   TString = _STRING;
   PString = ^TString;

packages/winunits-jedi/src/jwawintype.pas

@@ -83,7 +83,7 @@ type
   EJwaLoadLibraryError = class(EJwaError);
   EJwaGetProcAddressError = class(EJwaError);
 
-procedure GetProcedureAddress(var P: Pointer; const ModuleName, ProcName: string);
+procedure GetProcedureAddress(var P: Pointer; const ModuleName, ProcName: Ansistring);
 
 type
   // (rom) moved from JwaRpc.pas
@@ -210,24 +210,24 @@ type
 // ANSI (Multi-byte Character) types
 //
 
-  LPCH = ^Char;
+  LPCH = ^AnsiChar;
   {$EXTERNALSYM LPCH}
-  PCH = ^Char;
+  PCH = ^AnsiChar;
   {$EXTERNALSYM PCH}
 
-  LPCCH = ^Char;
+  LPCCH = ^AnsiChar;
   {$EXTERNALSYM LPCCH}
-  PCCH = ^Char;
+  PCCH = ^AnsiChar;
   {$EXTERNALSYM PCCH}
-  NPSTR = ^Char;
+  NPSTR = ^AnsiChar;
   {$EXTERNALSYM NPSTR}
   LPSTR = {$IFDEF USE_DELPHI_TYPES} Windows.LPSTR {$ELSE} PAnsiChar {$ENDIF};
   {$EXTERNALSYM LPSTR}
-  PSTR = PChar;
+  PSTR = PAnsiChar;
   {$EXTERNALSYM PSTR}
   LPCSTR = {$IFDEF USE_DELPHI_TYPES} Windows.LPCSTR {$ELSE} PAnsiChar {$ENDIF};
   {$EXTERNALSYM LPCSTR}
-  PCSTR = PChar;
+  PCSTR = PAnsiChar;
   {$EXTERNALSYM PCSTR}
 
 // (rom) moved down to have LPSTR etc always declared
@@ -300,9 +300,9 @@ type
 
   {$ELSE}
 
-  TCHAR = Char;
+  TCHAR = AnsiChar;
   {$EXTERNALSYM TCHAR}
-  PTCHAR = PChar;
+  PTCHAR = PAnsiChar;
   {$EXTERNALSYM PTCHAR}
   TUCHAR = Byte;
   {$EXTERNALSYM TUCHAR}
@@ -412,7 +412,7 @@ const
 //
 
 type
-  CCHAR = Char;
+  CCHAR = AnsiChar;
   {$EXTERNALSYM CCHAR}
   CSHORT = Shortint;
   {$EXTERNALSYM CSHORT}
@@ -702,9 +702,9 @@ type
 // Pointer to an Asciiz string
 //
 
-  PSZ = ^CHAR;
+  PSZ = ^AnsiChar;
   {$EXTERNALSYM PSZ}
-  PCSZ = ^CHAR;
+  PCSZ = ^AnsiChar;
   {$EXTERNALSYM PCSZ}
 
 //
@@ -715,7 +715,7 @@ type
   _STRING = record
     Length: USHORT;
     MaximumLength: USHORT;
-    Buffer: PCHAR;
+    Buffer: PAnsiChar;
   end;
   {$EXTERNALSYM _STRING}
   TString = _STRING;
@@ -738,7 +738,7 @@ type
   _CSTRING = record
     Length: USHORT;
     MaximumLength: USHORT;
-    Buffer: PCHAR;
+    Buffer: PAnsiChar;
   end;
   {$EXTERNALSYM _CSTRING}
   CSTRING = _CSTRING;
@@ -746,7 +746,7 @@ type
   TCString = CSTRING;
 
 const
-  ANSI_NULL = CHAR(0);
+  ANSI_NULL = AnsiChar(0);
   {$EXTERNALSYM ANSI_NULL}
   UNICODE_NULL = WCHAR(0);
   {$EXTERNALSYM UNICODE_NULL}
@@ -1178,7 +1178,7 @@ const
 
 type
 
-//unsigned char       BYTE;
+//unsigned AnsiChar       BYTE;
 //unsigned short      WORD;
 
   FLOAT = Single;
@@ -1847,7 +1847,7 @@ const
   RsELibraryNotFound = 'Library not found: %s';
   RsEFunctionNotFound = 'Function not found: %s.%s';
 
-procedure GetProcedureAddress(var P: Pointer; const ModuleName, ProcName: string);
+procedure GetProcedureAddress(var P: Pointer; const ModuleName, ProcName: Ansistring);
 var
   ModuleHandle: HMODULE;
 begin
@@ -1856,18 +1856,18 @@ begin
     ModuleHandle := {$IFDEF JWA_INCLUDEMODE}jwaWinType_GetModuleHandle
                     {$ELSE}GetModuleHandle
                     {$ENDIF JWA_INCLUDEMODE}
-                    (PChar(ModuleName));
+                    (PAnsiChar(ModuleName));
     if ModuleHandle = 0 then
     begin
       ModuleHandle := {$IFDEF JWA_INCLUDEMODE}jwaWinType_LoadLibrary
                     {$ELSE}LoadLibrary
-                    {$ENDIF JWA_INCLUDEMODE}(PChar(ModuleName));
+                    {$ENDIF JWA_INCLUDEMODE}(PAnsiChar(ModuleName));
       if ModuleHandle = 0 then
         raise EJwaLoadLibraryError.CreateFmt(RsELibraryNotFound, [ModuleName]);
     end;
     P := Pointer({$IFDEF JWA_INCLUDEMODE}jwaWinType_GetProcAddress
                     {$ELSE}GetProcAddress
-                    {$ENDIF JWA_INCLUDEMODE}(ModuleHandle, PChar(ProcName)));
+                    {$ENDIF JWA_INCLUDEMODE}(ModuleHandle, PAnsiChar(ProcName)));
     if not Assigned(P) then
       raise EJwaGetProcAddressError.CreateFmt(RsEFunctionNotFound, [ModuleName, ProcName]);
   end;

packages/winunits-jedi/src/jwawinuser.pas

@@ -250,7 +250,7 @@ const
   {$EXTERNALSYM MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID}
 
 type
-  va_list = PChar;
+  va_list = PAnsiChar;
   {$EXTERNALSYM va_list}
 
 function wvsprintfA(Output: LPSTR; Format: LPCSTR; arglist: va_list): Integer; stdcall;
@@ -410,7 +410,7 @@ const
   {$EXTERNALSYM AW_BLEND}
 
 //
-// WM_KEYUP/DOWN/CHAR HIWORD(lParam) flags
+// WM_KEYUP/DOWN/AnsiChar HIWORD(lParam) flags
 //
 
   KF_EXTENDED = $0100;
@@ -4821,28 +4821,28 @@ function AnsiPrev(lpszStart: LPCSTR; lpszCurrent: LPCSTR): LPSTR;
 // Language dependent Routines
 //
 
-function IsCharAlphaA(ch: CHAR): BOOL; stdcall;
+function IsCharAlphaA(ch: AnsiChar): BOOL; stdcall;
 {$EXTERNALSYM IsCharAlphaA}
 function IsCharAlphaW(ch: WCHAR): BOOL; stdcall;
 {$EXTERNALSYM IsCharAlphaW}
 function IsCharAlpha(ch: TCHAR): BOOL; stdcall;
 {$EXTERNALSYM IsCharAlpha}
 
-function IsCharAlphaNumericA(ch: CHAR): BOOL; stdcall;
+function IsCharAlphaNumericA(ch: AnsiChar): BOOL; stdcall;
 {$EXTERNALSYM IsCharAlphaNumericA}
 function IsCharAlphaNumericW(ch: WCHAR): BOOL; stdcall;
 {$EXTERNALSYM IsCharAlphaNumericW}
 function IsCharAlphaNumeric(ch: TCHAR): BOOL; stdcall;
 {$EXTERNALSYM IsCharAlphaNumeric}
 
-function IsCharUpperA(ch: CHAR): BOOL; stdcall;
+function IsCharUpperA(ch: AnsiChar): BOOL; stdcall;
 {$EXTERNALSYM IsCharUpperA}
 function IsCharUpperW(ch: WCHAR): BOOL; stdcall;
 {$EXTERNALSYM IsCharUpperW}
 function IsCharUpper(ch: TCHAR): BOOL; stdcall;
 {$EXTERNALSYM IsCharUpper}
 
-function IsCharLowerA(ch: CHAR): BOOL; stdcall;
+function IsCharLowerA(ch: AnsiChar): BOOL; stdcall;
 {$EXTERNALSYM IsCharLowerA}
 function IsCharLowerW(ch: WCHAR): BOOL; stdcall;
 {$EXTERNALSYM IsCharLowerW}
@@ -4898,14 +4898,14 @@ function ToUnicode(wVirtKey, wScanCode: UINT; lpKeyState: PBYTE; pwszBuff: LPWST
 function OemKeyScan(wOemChar: WORD): DWORD; stdcall;
 {$EXTERNALSYM OemKeyScan}
 
-function VkKeyScanA(ch: CHAR): SHORT; stdcall;
+function VkKeyScanA(ch: AnsiChar): SHORT; stdcall;
 {$EXTERNALSYM VkKeyScanA}
 function VkKeyScanW(ch: WCHAR): SHORT; stdcall;
 {$EXTERNALSYM VkKeyScanW}
 function VkKeyScan(ch: TCHAR): SHORT; stdcall;
 {$EXTERNALSYM VkKeyScan}
 
-function VkKeyScanExA(ch: CHAR; dwhkl: HKL): SHORT; stdcall;
+function VkKeyScanExA(ch: AnsiChar; dwhkl: HKL): SHORT; stdcall;
 {$EXTERNALSYM VkKeyScanExA}
 function VkKeyScanExW(ch: WCHAR; dwhkl: HKL): SHORT; stdcall;
 {$EXTERNALSYM VkKeyScanExW}
@@ -8732,8 +8732,8 @@ type
   {$EXTERNALSYM LPMULTIKEYHELPA}
   tagMULTIKEYHELPA = record
     mkSize: DWORD;
-    mkKeylist: CHAR;
-    szKeyphrase: array [0..0] of CHAR;
+    mkKeylist: AnsiChar;
+    szKeyphrase: array [0..0] of AnsiChar;
   end;
   {$EXTERNALSYM tagMULTIKEYHELPA}
   MULTIKEYHELPA = tagMULTIKEYHELPA;
@@ -8779,7 +8779,7 @@ type
     dx: Integer;
     dy: Integer;
     wMax: Integer;
-    rgchMember: array [0..1] of CHAR;
+    rgchMember: array [0..1] of AnsiChar;
   end;
   {$EXTERNALSYM tagHELPWININFOA}
   HELPWININFOA = tagHELPWININFOA;
@@ -10084,7 +10084,7 @@ type
   {$EXTERNALSYM LPMONITORINFOEXA}
   tagMONITORINFOEXA = record
     MonitorInfo: MONITORINFO;
-    szDevice: array [0..CCHDEVICENAME - 1] of CHAR;
+    szDevice: array [0..CCHDEVICENAME - 1] of AnsiChar;
   end;
   {$EXTERNALSYM tagMONITORINFOEXA}
   MONITORINFOEXA = tagMONITORINFOEXA;

packages/winunits-jedi/src/jwaws2dnet.pas

@@ -142,7 +142,7 @@ type
     sdn_flags: Byte;        // flags
     sdn_objnum: Byte;       // object number
     sdn_objnamel: Word;     // size of object name
-    sdn_objname: array [0..DN_MAXOBJL - 1] of Char; // object name
+    sdn_objname: array [0..DN_MAXOBJL - 1] of AnsiChar; // object name
     sdn_add: dn_naddr;      // node address
   end;
   {$EXTERNALSYM sockaddr_dn}
@@ -181,11 +181,11 @@ const
 
 type
   nodeent_f = packed record
-    n_name: PChar;      // name of node
+    n_name: PAnsiChar;      // name of node
     n_addrtype: Word;   // node address type
     n_length: Word;     // address length
-    n_addr: PChar;      // address
-    n_params: PChar;    // node parameters
+    n_addr: PAnsiChar;      // address
+    n_params: PAnsiChar;    // node parameters
     n_reserved: array [0..15] of Byte; // Reserved
   end;
   {$EXTERNALSYM nodeent_f}
@@ -256,8 +256,8 @@ type
   dnet_accent = packed record
     dac_status: Byte;      // Reserved
     dac_type: Byte;        // DN_NONE, etc.
-    dac_username: array [0..DN_MAXACCL] of Char;
-    dac_password: array [0..DN_MAXACCL] of Char;
+    dac_username: array [0..DN_MAXACCL] of AnsiChar;
+    dac_password: array [0..DN_MAXACCL] of AnsiChar;
   end;
   {$EXTERNALSYM dnet_accent}
   DNETACCENT = dnet_accent;
@@ -311,32 +311,32 @@ const
 (*
 MVB TODO: Extension functions must be dynamically queried for using WSAIoctl.
 
-function dnet_addr(cp: PChar): PDNAddr; stdcall;
+function dnet_addr(cp: PAnsiChar): PDNAddr; stdcall;
 {$EXTERNALSYM dnet_addr}
 function dnet_eof(s: SOCKET): Integer; stdcall;
 {$EXTERNALSYM dnet_eof}
 function dnet_getacc(const nacc: TDNetAccent): PDNetAccent; stdcall;
 {$EXTERNALSYM dnet_getacc}
-function dnet_getalias(P: PChar): PChar; stdcall;
+function dnet_getalias(P: PAnsiChar): PAnsiChar; stdcall;
 {$EXTERNALSYM dnet_getalias}
-function dnet_htoa(const add: TDNNAddr): PChar; stdcall;
+function dnet_htoa(const add: TDNNAddr): PAnsiChar; stdcall;
 {$EXTERNALSYM dnet_htoa}
-function dnet_ntoa(const add: TDNNAddr): PChar; stdcall;
+function dnet_ntoa(const add: TDNNAddr): PAnsiChar; stdcall;
 {$EXTERNALSYM dnet_ntoa}
 function getnodeadd: PDNNAddr; stdcall;
 {$EXTERNALSYM getnodeadd}
-function getnodebyaddr(addr: PChar; len, type_: Integer): PNodeEntF; stdcall;
+function getnodebyaddr(addr: PAnsiChar; len, type_: Integer): PNodeEntF; stdcall;
 {$EXTERNALSYM getnodebyaddr}
-function getnodebyname(name: PChar): PNodeEntF; stdcall;
+function getnodebyname(name: PAnsiChar): PNodeEntF; stdcall;
 {$EXTERNALSYM getnodebyname}
-function getnodename: PChar; stdcall;
+function getnodename: PAnsiChar; stdcall;
 {$EXTERNALSYM getnodename}
 *)
 
 // typedefs for C++ compatability
 
 type
-  LPDNETADDR = function(cp: PChar): PDNNAddr; stdcall;
+  LPDNETADDR = function(cp: PAnsiChar): PDNNAddr; stdcall;
   {$EXTERNALSYM LPDNETADDR}
   TDNetAddr = LPDNETADDR;
   LPDNETEOF = function(s: TSocket): Integer; stdcall;
@@ -345,25 +345,25 @@ type
   LPDNETGETACC = function(const nacc: TDNetAccent): PDNetAccent; stdcall;
   {$EXTERNALSYM LPDNETGETACC}
   TDNetGetAcc = LPDNETGETACC;
-  LPDNETGETALIAS = function(P: PChar): PChar; stdcall;
+  LPDNETGETALIAS = function(P: PAnsiChar): PAnsiChar; stdcall;
   {$EXTERNALSYM LPDNETGETALIAS}
   TDNetGetAlias = LPDNETGETALIAS;
-  LPDNETHTOA = function(const add: TDNNAddr): PChar; stdcall;
+  LPDNETHTOA = function(const add: TDNNAddr): PAnsiChar; stdcall;
   {$EXTERNALSYM LPDNETHTOA}
   TDNetHToA = LPDNETHTOA;
-  LPDNETNTOA = function(const add: TDNNAddr): PChar; stdcall;
+  LPDNETNTOA = function(const add: TDNNAddr): PAnsiChar; stdcall;
   {$EXTERNALSYM LPDNETNTOA}
   TDNetNToA = LPDNETNTOA;
   LPGETNODEADD = function: PDNNAddr; stdcall;
   {$EXTERNALSYM LPGETNODEADD}
   TGetNodeAdd = LPGETNODEADD;
-  LPGETNODEBYADDR = function(addr: PChar; len, type_: Integer): PNodeEntF; stdcall;
+  LPGETNODEBYADDR = function(addr: PAnsiChar; len, type_: Integer): PNodeEntF; stdcall;
   {$EXTERNALSYM LPGETNODEBYADDR}
   TGetNodeByAddr = LPGETNODEBYADDR;
-  LPGETNODEBYNAME = function(name: PChar): PNodeEntF; stdcall;
+  LPGETNODEBYNAME = function(name: PAnsiChar): PNodeEntF; stdcall;
   {$EXTERNALSYM LPGETNODEBYNAME}
   TGetNodeByName = LPGETNODEBYNAME;
-  LPGETNODENAME = function: PChar; stdcall;
+  LPGETNODENAME = function: PAnsiChar; stdcall;
   {$EXTERNALSYM LPGETNODENAME}
   TGetNodeName = LPGETNODENAME;
 {$ENDIF JWA_IMPLEMENTATIONSECTION}

packages/winunits-jedi/src/jwaws2spi.pas

@@ -190,7 +190,7 @@ type
   {$EXTERNALSYM LPWSPGETSOCKNAME}
   TWspGetSockName = LPWSPGETSOCKNAME;
 
-  LPWSPGETSOCKOPT = function(s: TSocket; level, optname: Integer; optval: PChar; var optlen, lpErrno: Integer): Integer; stdcall;
+  LPWSPGETSOCKOPT = function(s: TSocket; level, optname: Integer; optval: PAnsiChar; var optlen, lpErrno: Integer): Integer; stdcall;
   {$EXTERNALSYM LPWSPGETSOCKOPT}
   TWspGetSockOpt = LPWSPGETSOCKOPT;
 
@@ -254,7 +254,7 @@ type
   {$EXTERNALSYM LPWSPSENDTO}
   TWspSendTo = LPWSPSENDTO;
 
-  LPWSPSETSOCKOPT = function(s: TSocket; level, optname: Integer; optval: PChar; optlen: Integer; var lpErrno: Integer): Integer; stdcall;
+  LPWSPSETSOCKOPT = function(s: TSocket; level, optname: Integer; optval: PAnsiChar; optlen: Integer; var lpErrno: Integer): Integer; stdcall;
   {$EXTERNALSYM LPWSPSETSOCKOPT}
   TWspSetSockOpt = LPWSPSETSOCKOPT;
 
@@ -802,7 +802,7 @@ var
 
 function WSCEnumProtocols;
 begin
-  GetProcedureAddress(_WSCEnumProtocols, ws2_32, 'WSCEnumProtocols');
+  GetProcedureAddress(_WSCEnumProtocols, ws2_32, AnsiString('WSCEnumProtocols'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -817,7 +817,7 @@ var
 
 function WSCEnumProtocols32;
 begin
-  GetProcedureAddress(_WSCEnumProtocols32, ws2_32, 'WSCEnumProtocols32');
+  GetProcedureAddress(_WSCEnumProtocols32, ws2_32, ('WSCEnumProtocols32'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -832,7 +832,7 @@ var
 
 function WSCDeinstallProvider;
 begin
-  GetProcedureAddress(_WSCDeinstallProvider, ws2_32, 'WSCDeinstallProvider');
+  GetProcedureAddress(_WSCDeinstallProvider, ws2_32, AnsiString('WSCDeinstallProvider'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -847,7 +847,7 @@ var
 
 function WSCDeinstallProvider32;
 begin
-  GetProcedureAddress(_WSCDeinstallProvider32, ws2_32, 'WSCDeinstallProvider32');
+  GetProcedureAddress(_WSCDeinstallProvider32, ws2_32, AnsiString('WSCDeinstallProvider32'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -862,7 +862,7 @@ var
 
 function WSCInstallProvider;
 begin
-  GetProcedureAddress(_WSCInstallProvider, ws2_32, 'WSCInstallProvider');
+  GetProcedureAddress(_WSCInstallProvider, ws2_32, AnsiString('WSCInstallProvider'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -877,7 +877,7 @@ var
 
 function WSCInstallProvider64_32;
 begin
-  GetProcedureAddress(_WSCInstallProvider64_32, ws2_32, 'WSCInstallProvider64_32');
+  GetProcedureAddress(_WSCInstallProvider64_32, ws2_32, AnsiString('WSCInstallProvider64_32'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -892,7 +892,7 @@ var
 
 function WSCGetProviderPath;
 begin
-  GetProcedureAddress(_WSCGetProviderPath, ws2_32, 'WSCGetProviderPath');
+  GetProcedureAddress(_WSCGetProviderPath, ws2_32, AnsiString('WSCGetProviderPath'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -907,7 +907,7 @@ var
 
 function WSCGetProviderPath32;
 begin
-  GetProcedureAddress(_WSCGetProviderPath32, ws2_32, 'WSCGetProviderPath32');
+  GetProcedureAddress(_WSCGetProviderPath32, ws2_32, AnsiString('WSCGetProviderPath32'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -922,7 +922,7 @@ var
 
 function WSCUpdateProvider;
 begin
-  GetProcedureAddress(_WSCUpdateProvider, ws2_32, 'WSCUpdateProvider');
+  GetProcedureAddress(_WSCUpdateProvider, ws2_32, AnsiString('WSCUpdateProvider'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -937,7 +937,7 @@ var
 
 function WSCUpdateProvider32;
 begin
-  GetProcedureAddress(_WSCUpdateProvider32, ws2_32, 'WSCUpdateProvider32');
+  GetProcedureAddress(_WSCUpdateProvider32, ws2_32, AnsiString('WSCUpdateProvider32'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -952,7 +952,7 @@ var
 
 function WSCInstallQOSTemplate;
 begin
-  GetProcedureAddress(_WSCInstallQOSTemplate, String(qosname), String('WSCInstallQOSTemplate'));
+  GetProcedureAddress(_WSCInstallQOSTemplate, AnsiString(qosname), AnsiString('WSCInstallQOSTemplate'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -965,7 +965,7 @@ var
 
 function WSCRemoveQOSTemplate;
 begin
-  GetProcedureAddress(_WSCRemoveQOSTemplate, String(qosname), String('WSCRemoveQOSTemplate'));
+  GetProcedureAddress(_WSCRemoveQOSTemplate, AnsiString(qosname), AnsiString('WSCRemoveQOSTemplate'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -980,7 +980,7 @@ var
 
 function WSCEnumNameSpaceProviders32;
 begin
-  GetProcedureAddress(_WSCEnumNameSpaceProviders32, ws2_32, 'WSCEnumNameSpaceProviders32');
+  GetProcedureAddress(_WSCEnumNameSpaceProviders32, ws2_32, AnsiString('WSCEnumNameSpaceProviders32'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -995,7 +995,7 @@ var
 
 function WSCInstallNameSpace;
 begin
-  GetProcedureAddress(_WSCInstallNameSpace, ws2_32, 'WSCInstallNameSpace');
+  GetProcedureAddress(_WSCInstallNameSpace, ws2_32, AnsiString('WSCInstallNameSpace'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -1010,7 +1010,7 @@ var
 
 function WSCInstallNameSpace32;
 begin
-  GetProcedureAddress(_WSCInstallNameSpace32, ws2_32, 'WSCInstallNameSpace32');
+  GetProcedureAddress(_WSCInstallNameSpace32, ws2_32, AnsiString('WSCInstallNameSpace32'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -1025,7 +1025,7 @@ var
 
 function WSCUnInstallNameSpace;
 begin
-  GetProcedureAddress(_WSCUnInstallNameSpace, ws2_32, 'WSCUnInstallNameSpace');
+  GetProcedureAddress(_WSCUnInstallNameSpace, ws2_32, AnsiString('WSCUnInstallNameSpace'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -1040,7 +1040,7 @@ var
 
 function WSCUnInstallNameSpace32;
 begin
-  GetProcedureAddress(_WSCUnInstallNameSpace32, ws2_32, 'WSCUnInstallNameSpace32');
+  GetProcedureAddress(_WSCUnInstallNameSpace32, ws2_32, AnsiString('WSCUnInstallNameSpace32'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -1055,7 +1055,7 @@ var
 
 function WSCEnableNSProvider;
 begin
-  GetProcedureAddress(_WSCEnableNSProvider, ws2_32, 'WSCEnableNSProvider');
+  GetProcedureAddress(_WSCEnableNSProvider, ws2_32, AnsiString('WSCEnableNSProvider'));
   asm
         MOV     ESP, EBP
         POP     EBP
@@ -1070,7 +1070,7 @@ var
 
 function WSCEnableNSProvider32;
 begin
-  GetProcedureAddress(_WSCEnableNSProvider32, ws2_32, 'WSCEnableNSProvider32');
+  GetProcedureAddress(_WSCEnableNSProvider32, ws2_32, AnsiString('WSCEnableNSProvider32'));
   asm
         MOV     ESP, EBP
         POP     EBP

packages/winunits-jedi/src/jwaws2tcpip.pas

@@ -467,7 +467,7 @@ type
     ai_socktype: Integer;    // SOCK_xxx
     ai_protocol: Integer;    // 0 or IPPROTO_xxx for IPv4 and IPv6
     ai_addrlen: size_t;  // Length of ai_addr
-    ai_canonname: PChar; // Canonical name for nodename
+    ai_canonname: PAnsiChar; // Canonical name for nodename
     ai_addr: PSockAddr;  // Binary address
     ai_next: LPADDRINFO;  // Next structure in linked list
   end;
@@ -485,7 +485,7 @@ const
   AI_NUMERICHOST = $4; // Nodename must be a numeric address string
   {$EXTERNALSYM AI_NUMERICHOST}
 
-function getaddrinfo(nodename, servname: PChar; hints: PAddrInfo; var res: PAddrInfo): Integer; stdcall;
+function getaddrinfo(nodename, servname: PAnsiChar; hints: PAddrInfo; var res: PAddrInfo): Integer; stdcall;
 {$EXTERNALSYM getaddrinfo}
 
 procedure freeaddrinfo(ai: PAddrInfo); stdcall;
@@ -501,7 +501,7 @@ const
   GAI_STRERROR_BUFFER_SIZE = 1024;
   {$EXTERNALSYM GAI_STRERROR_BUFFER_SIZE}
 
-function gai_strerrorA(ecode: Integer): PChar;
+function gai_strerrorA(ecode: Integer): PAnsiChar;
 {$EXTERNALSYM gai_strerrorA}
 function gai_strerrorW(ecode: Integer): PWideChar;
 {$EXTERNALSYM gai_strerrorW}
@@ -512,7 +512,7 @@ type
   socklen_t = Integer;
   {$EXTERNALSYM socklen_t}
 
-function getnameinfo(sa: PSockAddr; salen: socklen_t; host: PChar; hostlen: DWORD; serv: PChar; servlen: DWORD; flags: Integer): Integer; stdcall;
+function getnameinfo(sa: PSockAddr; salen: socklen_t; host: PAnsiChar; hostlen: DWORD; serv: PAnsiChar; servlen: DWORD; flags: Integer): Integer; stdcall;
 {$EXTERNALSYM getnameinfo}
 
 const
@@ -683,19 +683,19 @@ begin
 end;
 
 var
-  gai_strerror_buffA: array [0..GAI_STRERROR_BUFFER_SIZE-1] of Char;
+  gai_strerror_buffA: array [0..GAI_STRERROR_BUFFER_SIZE-1] of AnsiChar;
   gai_strerror_buffW: array [0..GAI_STRERROR_BUFFER_SIZE-1] of WideChar;
 
-function gai_strerrorA(ecode: Integer): PChar;
+function gai_strerrorA(ecode: Integer): PAnsiChar;
 var
   dwMsgLen: DWORD;
 begin
   dwMsgLen := FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM or FORMAT_MESSAGE_IGNORE_INSERTS or FORMAT_MESSAGE_MAX_WIDTH_MASK,
-    nil, ecode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), PChar(@gai_strerror_buffA[0]), GAI_STRERROR_BUFFER_SIZE, nil);
+    nil, ecode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), PAnsiChar(@gai_strerror_buffA[0]), GAI_STRERROR_BUFFER_SIZE, nil);
   if dwMsgLen = 0 then
     Result := nil
   else
-    Result := PChar(@gai_strerror_buffA[0]);
+    Result := PAnsiChar(@gai_strerror_buffA[0]);
 end;
 
 function gai_strerrorW(ecode: Integer): PWideChar;

packages/winunits-jedi/src/jwawshisotp.pas

@@ -156,7 +156,7 @@ type
   TSockAddrTP = SOCKADDR_TP;
   PSockAddrTP = LPSOCKADDR_TP;  
 
-//procedure ISO_SET_TP_ADDR(var sa_tp: TSockAddrTP; port: PChar; portlen: u_short; node: PChar; nodelen: u_short);
+//procedure ISO_SET_TP_ADDR(var sa_tp: TSockAddrTP; port: PAnsiChar; portlen: u_short; node: PAnsiChar; nodelen: u_short);
 //{$EXTERNALSYM ISO_SET_TP_ADDR}
 
 //
@@ -181,7 +181,7 @@ implementation
 {$IFNDEF JWA_INTERFACESECTION}
 
 // TODO
-//procedure ISO_SET_TP_ADDR(var sa_tp: TSockAddrTP; port: PChar; portlen: u_short; node: PChar; nodelen: u_short);
+//procedure ISO_SET_TP_ADDR(var sa_tp: TSockAddrTP; port: PAnsiChar; portlen: u_short; node: PAnsiChar; nodelen: u_short);
 //begin
 //  sa_tp.tp_family := AF_ISO;
 //  sa_tp.tp_addr_type := ISO_HIERARCHICAL;

packages/winunits-jedi/src/jwawsipx.pas

@@ -94,8 +94,8 @@ interface
 type
   SOCKADDR_IPX = record
     sa_family: Smallint;
-    sa_netnum: array [0..3] of Char;
-    sa_nodenum: array [0..5] of Char;
+    sa_netnum: array [0..3] of AnsiChar;
+    sa_nodenum: array [0..5] of AnsiChar;
     sa_socket: Word;
   end;
   {$EXTERNALSYM SOCKADDR_IPX}

packages/winunits-jedi/src/jwawsnetbs.pas

@@ -84,7 +84,7 @@ type
   SOCKADDR_NB = record
     snb_family: Smallint;
     snb_type: Word;
-    snb_name: array [0..NETBIOS_NAME_LENGTH - 1] of Char;
+    snb_name: array [0..NETBIOS_NAME_LENGTH - 1] of AnsiChar;
   end;
   {$EXTERNALSYM SOCKADDR_NB}
   PSOCKADDR_NB = ^SOCKADDR_NB;
@@ -114,7 +114,7 @@ const
 // A macro convenient for setting up NETBIOS SOCKADDRs.
 //
 
-procedure SET_NETBIOS_SOCKADDR(var SNB: TSockAddrNB; _Type: u_short; const Name: string; Port: Byte);
+procedure SET_NETBIOS_SOCKADDR(var SNB: TSockAddrNB; _Type: u_short; const Name: ansistring; Port: Byte);
 {$EXTERNALSYM SET_NETBIOS_SOCKADDR}
 
 
@@ -138,7 +138,7 @@ implementation
 
 {$IFNDEF JWA_INTERFACESECTION}
 
-procedure SET_NETBIOS_SOCKADDR(var SNB: TSockAddrNB; _Type: u_short; const Name: string; Port: Byte);
+procedure SET_NETBIOS_SOCKADDR(var SNB: TSockAddrNB; _Type: u_short; const Name: ansistring; Port: Byte);
 var
   I: Integer;
 begin
@@ -154,7 +154,7 @@ begin
     SNB.snb_name[I] := SNB.snb_name[I + 1];
     Inc(I);
   end;
-  SNB.snb_name[NETBIOS_NAME_LENGTH - 1] := Char(Port);
+  SNB.snb_name[NETBIOS_NAME_LENGTH - 1] := AnsiChar(Port);
 end;
 
 {$ENDIF JWA_INTERFACESECTION}

packages/winunits-jedi/src/jwawsnwlink.pas

@@ -124,9 +124,9 @@ const
 
 //
 //   Enable extended addressing.  On sends, adds the element
-//   "unsigned char sa_ptype" to the SOCKADDR_IPX structure,
+//   "unsigned AnsiChar sa_ptype" to the SOCKADDR_IPX structure,
 //   making the total length 15 bytes.  On receives, add both
-//   the sa_ptype and "unsigned char sa_flags" to the SOCKADDR_IPX
+//   the sa_ptype and "unsigned AnsiChar sa_flags" to the SOCKADDR_IPX
 //   structure, making the total length 16 bytes.  The current
 //   bits defined in sa_flags are:
 //

packages/winunits-jedi/src/jwawtsapi32.pas

@@ -686,10 +686,10 @@ function WTSVirtualChannelClose(hChannelHandle: HANDLE): BOOL; stdcall;
 {$EXTERNALSYM WTSVirtualChannelClose}
 
 function WTSVirtualChannelRead(hChannelHandle: HANDLE; TimeOut: ULONG;
-  Buffer: PCHAR; BufferSize: ULONG; var pBytesRead: ULONG): BOOL; stdcall;
+  Buffer: PAnsiChar; BufferSize: ULONG; var pBytesRead: ULONG): BOOL; stdcall;
 {$EXTERNALSYM WTSVirtualChannelRead}
 
-function WTSVirtualChannelWrite(hChannelHandle: HANDLE; Buffer: PCHAR;
+function WTSVirtualChannelWrite(hChannelHandle: HANDLE; Buffer: PAnsiChar;
   Length: ULONG; var pBytesWritten: ULONG): BOOL; stdcall;
 {$EXTERNALSYM WTSVirtualChannelWrite}
 

packages/winunits-jedi/tests/tjwapsapi1.pp

@@ -13,7 +13,7 @@ uses
     const mHandle : HMODULE)
     : string;
   var
-    name : array [0..1023] of char;
+    name : array [0..1023] of AnsiChar;
   begin
     result := 'ERROR';
     if GetModuleFileNameEx(pHandle,mHandle,LPTSTR(@name[0]),sizeof(name)) > 0 then begin