* PChar -> PAnsiChar

packages/cdrom/examples/getdiscid.pp

@@ -20,7 +20,7 @@ Var
   TheDiscID : cardinal;
   Tracks, i : Integer;
   Entries : Array[1..100] of TTocEntry;
-  Device : string;
+  Device : AnsiString;
 
 begin
   Case ParamCount of

packages/cdrom/examples/showcds.pp

@@ -6,7 +6,7 @@ program showcds;
 uses cdrom,sysutils;
 
 Var
-  Drives : Array[1..10] of String;
+  Drives : Array[1..10] of AnsiString;
   I,Count : Integer;
 
 begin

packages/cdrom/src/cdrom.pp

@@ -34,10 +34,10 @@ Type
 // has 10 songs then ReadCDToc will return 10 but there are 11 entries: 0..10.
 // You still need to use the zero'th entry to get the first track length:
 // Track1Length := TOC[1].frames = TOC[0].frames.
-Function ReadCDTOC(Device : String; Var CDTOC : Array of TTocEntry) : Integer;
+Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer;
 
 // Returns the number of devices placed in 'Devices'
-Function GetCDRomDevices(Var Devices : Array of string) : Integer;
+Function GetCDRomDevices(Var Devices : Array of AnsiString) : Integer;
 
 Implementation
 

packages/cdrom/src/cdromlin.inc

@@ -3,7 +3,7 @@ uses
   unix,
   lincd;
 
-Function ReadCDTOC(Device : String; Var CDTOC : Array of TTocEntry) : Integer;
+Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer;
 
 Var
   I,Drive    : Integer;
@@ -62,7 +62,7 @@ end;
     /etc/fstab scanning.
   ---------------------------------------------------------------------}
 
-Function ExtractDevice(S : String) : String;
+Function ExtractDevice(S : AnsiString) : AnsiString;
 
 Var
   P,L : Integer;
@@ -85,11 +85,11 @@ begin
     end;
 end;
 
-Function TestFSTab(var Devices : Array of String) : Integer;
+Function TestFSTab(var Devices : Array of AnsiString) : Integer;
 
 Var
   fstab : text;
-  Line : String;
+  Line : AnsiString;
 
 begin
   Result:=0;
@@ -115,10 +115,10 @@ begin
     Result:=-1;
 end;
 
-Function GetCDRomDevices(Var Devices : Array of string) : Integer;
+Function GetCDRomDevices(Var Devices : Array of AnsiString) : Integer;
 
 
-  Function AlreadyAdded(AName: String; AMax: Integer): Boolean;
+  Function AlreadyAdded(AName: AnsiString; AMax: Integer): Boolean;
   var
     I: Integer;
   begin
@@ -129,13 +129,13 @@ Function GetCDRomDevices(Var Devices : Array of string) : Integer;
   end;
 
   // Resolves name if it's a symlink and adds it ensuring no dups
-  Function AddCdrom(ACDRom: String; I: Integer): Integer;
+  Function AddCdrom(ACDRom: AnsiString; I: Integer): Integer;
   var
     SInfo : stat;
-    RealName: String;
+    RealName: AnsiString;
   begin
     Result := I;
-    if fpStat(PChar(ACDRom), SInfo) <> -1 then
+    if fpStat(PAnsiChar(ACDRom), SInfo) <> -1 then
     begin
       RealName := ACDRom;
       if SInfo.st_mode and S_IFMT = S_IFLNK then
@@ -152,7 +152,7 @@ Function GetCDRomDevices(Var Devices : Array of string) : Integer;
 var
   I,J: Integer;
   CDRec: TCDSearchRec;
-  FSTab: array[0..10] of String;
+  FSTab: array[0..10] of AnsiString;
 
 begin
   I := 0;

packages/cdrom/src/cdromw32.inc

@@ -1,7 +1,7 @@
 uses wincd;
 
 
-Function ReadCDTOC(Device : String; Var CDTOC : Array of TTocEntry) : Integer;
+Function ReadCDTOC(Device : AnsiString; Var CDTOC : Array of TTocEntry) : Integer;
 
 Var
   Toc :  TToc;
@@ -44,7 +44,7 @@ begin
 end;
 
 
-Function GetCDRomDevices(Var Devices : Array of string) : Integer;
+Function GetCDRomDevices(Var Devices : Array of AnsiString) : Integer;
 begin
   Result:=enumcddrives(Devices);
 end;

packages/cdrom/src/discid.pp

@@ -21,7 +21,7 @@ interface
 uses cdrom,sysutils;
 
 Function CDDBDiscID(Const CDTOC : Array of TTocEntry; Count : Integer) : integer ;
-Function GetCDDBQueryString(Const Tracks : Array of TTocEntry; Count : Integer) : String;
+Function GetCDDBQueryString(Const Tracks : Array of TTocEntry; Count : Integer) : AnsiString;
 
 Implementation
 
@@ -52,7 +52,7 @@ begin
   Result:=(((n mod $ff) shl 24) or (t shl 8 or count));
 end;
 
-Function GetCDDBQueryString(Const Tracks : Array of TTocEntry; Count : Integer) : String;
+Function GetCDDBQueryString(Const Tracks : Array of TTocEntry; Count : Integer) : AnsiString;
 
 
 Var

packages/cdrom/src/fpcddb.pp

@@ -41,16 +41,16 @@ Type
   TCDTrack = Class(TCollectionItem)
   private
     FDuration: TDateTime;
-    FExtra: String;
-    FPerformer: String;
-    FTitle: String;
-    function GetPerformer: String;
+    FExtra: AnsiString;
+    FPerformer: AnsiString;
+    FTitle: AnsiString;
+    function GetPerformer: AnsiString;
   Public
     Procedure Assign(Source : TPersistent); override;
   Published
-    Property Title : String Read FTitle Write FTitle;
-    Property Performer : String Read GetPerformer Write FPerformer;
-    Property Extra : String Read FExtra Write FExtra;
+    Property Title : AnsiString Read FTitle Write FTitle;
+    Property Performer : AnsiString Read GetPerformer Write FPerformer;
+    Property Extra : AnsiString Read FExtra Write FExtra;
     Property Duration : TDateTime Read FDuration Write FDuration;
   end;
 
@@ -63,9 +63,9 @@ Type
     procedure SetT(AIndex : Integer; const AValue: TCDTrack);
   Public
     Property CDDisk : TCDDisk Read FCDDisk;
-    Function AddTrack(Const ATitle,AExtra : String; ADuration : TDateTime) : TCDTrack;
-    Function AddTrack(Const ATitle,AExtra : String) : TCDTrack;
-    Function AddTrack(Const ATitle : String) : TCDTrack;
+    Function AddTrack(Const ATitle,AExtra : AnsiString; ADuration : TDateTime) : TCDTrack;
+    Function AddTrack(Const ATitle,AExtra : AnsiString) : TCDTrack;
+    Function AddTrack(Const ATitle : AnsiString) : TCDTrack;
     Property Track[AIndex : Integer] : TCDTrack Read GetT Write SetT; default;
   end;
 
@@ -75,15 +75,15 @@ Type
   TCDDisk = Class(TCollectionItem)
   private
     FDiskID: Integer;
-    FExtra: String;
-    FGenre: String;
-    FPerformer: String;
-    FPlayOrder: String;
-    FTitle: String;
+    FExtra: AnsiString;
+    FGenre: AnsiString;
+    FPerformer: AnsiString;
+    FPlayOrder: AnsiString;
+    FTitle: AnsiString;
     FTracks: TCDTracks;
     FYear: Word;
-    function GetDiskID: String;
-    procedure SetDiskID(const AValue: String);
+    function GetDiskID: AnsiString;
+    procedure SetDiskID(const AValue: AnsiString);
     procedure SetTracks(const AValue: TCDTracks);
   Protected
     Function CreateTracks : TCDTracks; virtual;
@@ -93,13 +93,13 @@ Type
     Procedure Assign(Source : TPersistent); override;
     Property IntDiscID : Integer Read FDiskID Write FDiskID;
   Published
-    Property PlayOrder : String Read FPlayOrder Write FPlayOrder;
+    Property PlayOrder : AnsiString Read FPlayOrder Write FPlayOrder;
     Property Year : Word Read FYear Write FYear; // proto=5
-    Property Title : String Read FTitle Write FTitle;
-    Property Performer : String Read FPerformer Write FPerformer;
-    Property Genre : String Read FGenre write FGenre; //proto=5
-    Property Extra : String Read FExtra Write FExtra;
-    Property DiscID : String Read GetDiskID Write SetDiskID;
+    Property Title : AnsiString Read FTitle Write FTitle;
+    Property Performer : AnsiString Read FPerformer Write FPerformer;
+    Property Genre : AnsiString Read FGenre write FGenre; //proto=5
+    Property Extra : AnsiString Read FExtra Write FExtra;
+    Property DiscID : AnsiString Read GetDiskID Write SetDiskID;
     property Tracks : TCDTracks Read FTracks Write SetTracks;
   end;
 
@@ -110,7 +110,7 @@ Type
     function GetD(AIndex : Integer): TCDDisk;
     procedure SetD(AIndex : Integer; const AValue: TCDDisk);
   Public
-    Function AddDisk(ADiscID : String) : TCDDisk;
+    Function AddDisk(ADiscID : AnsiString) : TCDDisk;
     Function AddDisk : TCDDisk;
     Property Disk[AIndex : Integer] : TCDDisk Read GetD Write SetD; default;
   end;
@@ -118,17 +118,17 @@ Type
   { TCDDBQueryMatch }
   TCDDBQueryMatch = Class(TCollectionItem)
   private
-    FCategory: String;
+    FCategory: AnsiString;
     FDiscID: Integer;
-    FPerformer: String;
-    FTitle: String;
+    FPerformer: AnsiString;
+    FTitle: AnsiString;
   Public
     Procedure Assign(Source : TPersistent); override;
   Published
     Property DiscID : Integer Read FDiscID Write FDiscID;
-    Property Category : String Read FCategory Write FCategory;
-    Property Title : String Read FTitle Write FTitle;
-    Property Performer : String Read FPerformer Write FPerformer;
+    Property Category : AnsiString Read FCategory Write FCategory;
+    Property Title : AnsiString Read FTitle Write FTitle;
+    Property Performer : AnsiString Read FPerformer Write FPerformer;
   end;
 
   { TCDDBQueryMatches }
@@ -138,8 +138,8 @@ Type
     function GetM(AIndex : Integer): TCDDBQueryMatch;
     procedure SetM(AIndex : Integer; const AValue: TCDDBQueryMatch);
   Public
-    Function AddMatch(Const ADiscID: Integer; Const ACategory,ATitle, APerformer : String) : TCDDBQueryMatch;
-    Function AddMatch(Const ADiscID,ACategory,ATitle, APerformer : String) : TCDDBQueryMatch;
+    Function AddMatch(Const ADiscID: Integer; Const ACategory,ATitle, APerformer : AnsiString) : TCDDBQueryMatch;
+    Function AddMatch(Const ADiscID,ACategory,ATitle, APerformer : AnsiString) : TCDDBQueryMatch;
     Function AddMatch : TCDDBQueryMatch;
     Property Match[AIndex : Integer] :TCDDBQueryMatch Read GetM Write SetM; default;
   end;
@@ -149,18 +149,18 @@ Type
   private
     FDisks: TCDDisks;
     FDisk : TCDDisk;
-    function ParseExtraDiskData(AData: String): Boolean;
-    function ParseExtraTrackData(ATrack: TCDTrack; AData: String): Boolean;
+    function ParseExtraDiskData(AData: AnsiString): Boolean;
+    function ParseExtraTrackData(ATrack: TCDTrack; AData: AnsiString): Boolean;
     procedure SetDisks(const AValue: TCDDisks);
-    procedure SplitQueryResponse(AResponse: String; var ACategory, ADiscID, ATitle, APerformer: String);
-    procedure SplitTitle(const ALine: String; var AArtist, ATitle: String;
+    procedure SplitQueryResponse(AResponse: AnsiString; var ACategory, ADiscID, ATitle, APerformer: AnsiString);
+    procedure SplitTitle(const ALine: AnsiString; var AArtist, ATitle: AnsiString;
       PreferTitle: boolean);
-    function StdReplacements(S: String): String;
+    function StdReplacements(S: AnsiString): AnsiString;
   Protected
     Procedure CheckDisk;
-    function CheckCDDBCmdResult(var S: String): Integer;
+    function CheckCDDBCmdResult(var S: AnsiString): Integer;
     Function CreateDisks :TCDDisks; virtual;
-    Function IsComment(Const L : String) : Boolean;
+    Function IsComment(Const L : AnsiString) : Boolean;
     Function GetTrack(Const TrackNo : Integer) : TCDTrack;
     Property Disk : TCDDisk Read FDisk;
   Public
@@ -176,8 +176,8 @@ Type
 
   ECDDBParser = Class(Exception);
 
-Function DiscIDToStr(ID : Integer) : String;
-Function StrToDiscID(S : String) : Integer;
+Function DiscIDToStr(ID : Integer) : AnsiString;
+Function StrToDiscID(S : AnsiString) : Integer;
 
 implementation
 
@@ -187,19 +187,19 @@ Resourcestring
   SErrParsingLine    = 'An error occurred while parsing line %d of the response: %s';
   SErrCDDBResponse   = 'CDDB error in command response: %s';
 
-function DiscIDToStr(ID: Integer): String;
+function DiscIDToStr(ID: Integer): AnsiString;
 begin
   Result:=LowerCase(Format('%.8x',[ID]));
 end;
 
-function StrToDiscID(S: String): Integer;
+function StrToDiscID(S: AnsiString): Integer;
 begin
   Result:=StrToIntDef('$'+S,-1);
 end;
 
 { TCDTrack }
 
-function TCDTrack.GetPerformer: String;
+function TCDTrack.GetPerformer: AnsiString;
 begin
   Result:=FPerformer;
   If (Result='') and Assigned(Collection) and (Collection is TCDTracks) then
@@ -233,12 +233,12 @@ begin
   FTracks.Assign(AValue);
 end;
 
-function TCDDisk.GetDiskID: String;
+function TCDDisk.GetDiskID: AnsiString;
 begin
   Result:=DiscIDToStr(FdiskID);
 end;
 
-procedure TCDDisk.SetDiskID(const AValue: String);
+procedure TCDDisk.SetDiskID(const AValue: AnsiString);
 begin
   FDiskID:=StrToDiscID(AValue);
 end;
@@ -293,7 +293,7 @@ begin
   Items[AIndex]:=AValue;
 end;
 
-function TCDTracks.AddTrack(const ATitle, AExtra: String; ADuration: TDateTime
+function TCDTracks.AddTrack(const ATitle, AExtra: AnsiString; ADuration: TDateTime
   ): TCDTrack;
 begin
   Result:=Add as TCDTrack;
@@ -302,12 +302,12 @@ begin
   Result.Duration:=ADuration;
 end;
 
-function TCDTracks.AddTrack(const ATitle, AExtra: String): TCDTrack;
+function TCDTracks.AddTrack(const ATitle, AExtra: AnsiString): TCDTrack;
 begin
   Result:=AddTrack(ATitle,AExtra,0);
 end;
 
-function TCDTracks.AddTrack(const ATitle: String): TCDTrack;
+function TCDTracks.AddTrack(const ATitle: AnsiString): TCDTrack;
 begin
   Result:=AddTrack(ATitle,'',0);
 end;
@@ -324,7 +324,7 @@ begin
   Items[AIndex]:=AValue;
 end;
 
-function TCDDisks.AddDisk(ADiscID: String): TCDDisk;
+function TCDDisks.AddDisk(ADiscID: AnsiString): TCDDisk;
 begin
   Result:=Self.AddDisk();
   Result.DiscID:=ADiscID;
@@ -354,7 +354,7 @@ begin
   Result:=TCDDisks.Create(TCDDisk);
 end;
 
-function TCDDBParser.IsComment(const L: String): Boolean;
+function TCDDBParser.IsComment(const L: AnsiString): Boolean;
 begin
   Result:=(Length(L)=0) or (L[1]='#');
 end;
@@ -384,25 +384,25 @@ begin
   inherited Destroy;
 end;
 
-Function TCDDBParser.StdReplacements(S : String) : String;
+Function TCDDBParser.StdReplacements(S : AnsiString) : AnsiString;
 
 begin
   Result:=StringReplace(S,'\n',sLineBreak,[rfReplaceAll]);
 end;
 
-Function TCDDBParser.ParseExtraDiskData(AData : String) : Boolean;
+Function TCDDBParser.ParseExtraDiskData(AData : AnsiString) : Boolean;
 
 begin
   FDisk.Extra:=FDisk.Extra+StdReplacements(AData);
 end;
 
-Function TCDDBParser.ParseExtraTrackData(ATrack : TCDTrack; AData : String) : Boolean;
+Function TCDDBParser.ParseExtraTrackData(ATrack : TCDTrack; AData : AnsiString) : Boolean;
 
 begin
   ATrack.Extra:=ATrack.Extra+StdReplacements(AData);
 end;
 
-Procedure TCDDBParser.SplitTitle(Const ALine: String; Var AArtist, ATitle : String; PreferTitle : boolean);
+Procedure TCDDBParser.SplitTitle(Const ALine: AnsiString; Var AArtist, ATitle : AnsiString; PreferTitle : boolean);
 
 Var
   P,L : Integer;
@@ -421,7 +421,7 @@ Function TCDDBParser.ParseCDDBReadResponse(Response: TStrings; WithHeader : Bool
 
 Var
   I,P : Integer;
-  L,Args,A,T : String;
+  L,Args,A,T : AnsiString;
   TrackID : Integer;
   Track : TCDTrack;
 
@@ -525,8 +525,8 @@ function TCDDBParser.ParseCDDBQueryResponse(Response: TStrings;
 
 Var
   I,CmdRes : Integer;
-  L : String;
-  D,C,T,P : String;
+  L : AnsiString;
+  D,C,T,P : AnsiString;
 
 begin
   Matches.Clear;
@@ -570,7 +570,7 @@ begin
   end;
 end;
 
-Function TCDDBParser.CheckCDDBCmdResult(Var S : String) : Integer;
+Function TCDDBParser.CheckCDDBCmdResult(Var S : AnsiString) : Integer;
 
 Var
   P : integer;
@@ -583,7 +583,7 @@ begin
   Delete(S,1,P);
 end;
 
-Procedure TCDDBParser.SplitQueryResponse(AResponse :String; Var ACategory, ADiscID, ATitle, APerformer : String);
+Procedure TCDDBParser.SplitQueryResponse(AResponse :AnsiString; Var ACategory, ADiscID, ATitle, APerformer : AnsiString);
 
 Var
   P : Integer;
@@ -612,7 +612,7 @@ begin
 end;
 
 function TCDDBQueryMatches.AddMatch(const ADiscID: Integer; const ACategory,
-  ATitle, APerformer: String): TCDDBQueryMatch;
+  ATitle, APerformer: AnsiString): TCDDBQueryMatch;
 begin
   Result:=AddMatch();
   Result.DiscID:=ADiscID;
@@ -621,7 +621,7 @@ begin
   Result.Performer:=APerformer;
 end;
 
-function TCDDBQueryMatches.AddMatch(const ADiscID, ACategory, ATitle, APerformer : String): TCDDBQueryMatch;
+function TCDDBQueryMatches.AddMatch(const ADiscID, ACategory, ATitle, APerformer : AnsiString): TCDDBQueryMatch;
 
 begin
   Result:=AddMatch(StrToDiscID(ADiscID),ACategory,ATitle,APerformer);

packages/cdrom/src/lincd.pp

@@ -182,7 +182,7 @@ type
    Pcdrom_read = ^Tcdrom_read;
    Tcdrom_read = record
         cdread_lba : longint;
-        cdread_bufaddr : Pchar;
+        cdread_bufaddr : PAnsiChar;
         cdread_buflen : longint;
      end;
 
@@ -710,14 +710,14 @@ procedure set_sense_key(var a : Trequest_sense; __sense_key : Tu8);
   ---------------------------------------------------------------------}
 type
   TCDSearchRec = record
-    Name: String;
+    Name: AnsiString;
     i,j: Integer;
   end;
 
-Function IsCDDevice(Device : String) : Boolean;
+Function IsCDDevice(Device : AnsiString) : Boolean;
 Function FindFirstCD(var ACDSearchRec: TCDSearchRec): Boolean;
 Function FindNextCD(var ACDSearchRec: TCDSearchRec): Boolean;
-Function DetectCd : String;
+Function DetectCd : AnsiString;
 
 implementation
 
@@ -1087,7 +1087,7 @@ end;
 
 Const
   NrDevices = 16;
-  Devices : Array[1..NrDevices] of string = (
+  Devices : Array[1..NrDevices] of AnsiString = (
   '/dev/cdrom',
   '/dev/cdroms/cdrom?',
   '/dev/hd?',
@@ -1120,8 +1120,8 @@ end;
 function FindNextCD(var ACDSearchRec: TCDSearchRec): Boolean;
 var
   L: integer;
-  S: String;
-  FoundDev: String;
+  S: AnsiString;
+  FoundDev: AnsiString;
 begin
 
   Result := False;
@@ -1160,11 +1160,11 @@ begin
   ACDSearchRec.Name:=FoundDev;
 end;
 
-Function DetectCD : String;
+Function DetectCD : AnsiString;
 
 Var
   I,J,L : Integer;
-  S : String;
+  S : AnsiString;
 
 begin
   Result:='';
@@ -1199,14 +1199,14 @@ Const
               OPTICS_CDROM_MAJOR,AZTECH_CDROM_MAJOR,
               GOLDSTAR_CDROM_MAJOR,CM206_CDROM_MAJOR];
 
-Function TestCDRomIOCTL(Device : String) : Boolean;forward;
+Function TestCDRomIOCTL(Device : AnsiString) : Boolean;forward;
 
 
-Function IsCDDevice(Device : String) : Boolean;
+Function IsCDDevice(Device : AnsiString) : Boolean;
 
 Var
   Info : stat;
-  S : String;
+  S : AnsiString;
   DeviceMajor,F : Integer;
 
 begin
@@ -1251,7 +1251,7 @@ begin
     end;  
 end;
 
-Function TestCDRomIOCTL(Device : String) : Boolean;
+Function TestCDRomIOCTL(Device : AnsiString) : Boolean;
 
 Var
   F : Integer;

packages/cdrom/src/wincd.pp

@@ -28,13 +28,13 @@ TTOC = packed Record
 end;
 
 Const
-  AccessMethodNames : Array[TCDAccessMethod] of string
+  AccessMethodNames : Array[TCDAccessMethod] of AnsiString
                     = ('None','ASPI','SPTI','IOCTL');
 
 Function  GetCDAccessMethod : TCDAccessMethod;
 Procedure SetCDAccessMethod (Value : TCDAccessMethod);
-Function  ReadTOC(Device : String; Var TOC : TTOc) : Integer;
-Function  EnumCDDrives(Var Drives : Array of String) : Integer;
+Function  ReadTOC(Device : AnsiString; Var TOC : TTOc) : Integer;
+Function  EnumCDDrives(Var Drives : Array of AnsiString) : Integer;
 Function  GetNumDrives : Integer;
 
 implementation
@@ -150,12 +150,12 @@ end;
   1. SPTI
   ---------------------------------------------------------------------}
 
-Function sptiReadTOC(Device : String; var TOC: TToC) : Integer;
+Function sptiReadTOC(Device : AnsiString; var TOC: TToC) : Integer;
 
 Var
   DriveHandle : THandle;
   len : Cardinal;
-  buf : Array[0..31] of char;
+  buf : Array[0..31] of AnsiChar;
   ID,retVal : Integer;
   Returned,Flags : Cardinal;
   swb : TSCSI_PASS_THROUGH_DIRECT_WITH_BUFFER;
@@ -164,7 +164,7 @@ begin
   if (CDOSVer>4) then
     Flags:=Flags or Cardinal(GENERIC_WRITE);
   Device:=Upcase('\\.\'+Device);
-  DriveHandle:=CreateFileA(pchar(Device),Flags,FILE_SHARE_READ,
+  DriveHandle:=CreateFileA(PAnsiChar(Device),Flags,FILE_SHARE_READ,
                           nil,OPEN_EXISTING, 0, 0 );
   if (DriveHandle=INVALID_HANDLE_VALUE) then
     begin
@@ -228,7 +228,7 @@ begin
     Result:=Count;
 end;
 
-Function DriveToSCSIParm (Device : String; Var HID,TGT,LUN : Byte) : Boolean;
+Function DriveToSCSIParm (Device : AnsiString; Var HID,TGT,LUN : Byte) : Boolean;
 
 Var
   Code : Integer;
@@ -262,7 +262,7 @@ end;
 Var
   Atoc : TTOc;
 
-Function AspiReadTOC(Device : String; Var TOC : TTOC) : Integer;
+Function AspiReadTOC(Device : AnsiString; Var TOC : TTOC) : Integer;
 
 Var
   HAID,TGT,LUN : Byte;
@@ -325,7 +325,7 @@ end;
   3. IOCTL
   ---------------------------------------------------------------------}
 
-Function ioctlReadTOC(Device : String; Var TOC : TTOC) : Integer;
+Function ioctlReadTOC(Device : AnsiString; Var TOC : TTOC) : Integer;
 
 Var
   DriveHandle : Thandle;
@@ -336,7 +336,7 @@ Var
 begin
   Flags:=Cardinal(GENERIC_READ);
   device:=Upcase('\\.\'+device);
-  DriveHandle:=CreateFileA(PChar(Device), Flags,
+  DriveHandle:=CreateFileA(PAnsiChar(Device), Flags,
                           FILE_SHARE_READ, nil, OPEN_EXISTING, 0, 0 );
   if (DriveHandle = INVALID_HANDLE_VALUE) then
     begin
@@ -366,12 +366,12 @@ begin
 end;
 
 
-Function NtDriveInfo(CopyDrives : Boolean;Var CDDrives : Array of string): Integer;
+Function NtDriveInfo(CopyDrives : Boolean;Var CDDrives : Array of AnsiString): Integer;
 
 var
   I : Integer;
-  Drives : Array[0..105] of char;
-  P : PChar;
+  Drives : Array[0..105] of AnsiChar;
+  P : PAnsiChar;
 
 begin
   FillChar(Drives,SizeOf(Drives),0);
@@ -392,13 +392,13 @@ end;
 
 Function NTGetNumDrives: Integer;
 
-Var A : Array[1..1] of string;
+Var A : Array[1..1] of AnsiString;
 
 begin
   Result:=NTDriveInfo(False,A);
 end;
 
-Function ioctlEnumDrives(Var Drives : Array of string) : Integer;
+Function ioctlEnumDrives(Var Drives : Array of AnsiString) : Integer;
 
 begin
   result:=NTDriveInfo(True,Drives);
@@ -408,7 +408,7 @@ end;
   3. Generic
   ---------------------------------------------------------------------}
 
-Function ReadTOC(Device : String; Var TOC : TTOc) : Integer;
+Function ReadTOC(Device : AnsiString; Var TOC : TTOc) : Integer;
 
 begin
   Case CurrentAccessMethod of
@@ -432,7 +432,7 @@ begin
 end;
 
 
-Function ASPIDriveInfo(CopyInfo : Boolean; Var Drives : Array of string) : Integer;
+Function ASPIDriveInfo(CopyInfo : Boolean; Var Drives : Array of AnsiString) : Integer;
 
 var
   sh : SRB_HAInquiry;
@@ -481,7 +481,7 @@ end;
 Function ASPIGetNumDrives: Integer;
 
 Var
-  A : Array[1..1] of string;
+  A : Array[1..1] of AnsiString;
 
 begin
   Result:=AspiDriveInfo(False,A);
@@ -497,7 +497,7 @@ begin
    Result:=NTGetNumDrives;
 end;
 
-Function EnumCDDrives(Var Drives : Array of String) : Integer;
+Function EnumCDDrives(Var Drives : Array of AnsiString) : Integer;
 
 begin
  If CurrenTAccessMethod=camASPI then