Browse Source

* Fix compilation in unicode RTL

Michaël Van Canneyt 1 year ago
parent
commit
628e0cdbd1
2 changed files with 5 additions and 5 deletions
  1. 1 1
      packages/chm/src/chmcmd.lpr
  2. 4 4
      packages/chm/src/chmls.lpr

+ 1 - 1
packages/chm/src/chmcmd.lpr

@@ -111,7 +111,7 @@ var
   alloweddetaillevel : integer = 0;     // show if msg.detaillevel<=allowdetaillevel
   htmlscan           : THtmlScanEnum = Scandefault;
 
-procedure OnError (Project: TChmProject;errorkind:TChmProjectErrorKind;msg:String;detailevel:integer=0);
+procedure OnError (Project: TChmProject;errorkind:TChmProjectErrorKind;msg:rtlString;detailevel:integer=0);
 begin
   if (detailevel<=alloweddetaillevel) or (errorkind < chmnote) then
     if errorkind<>chmnone then

+ 4 - 4
packages/chm/src/chmls.lpr

@@ -49,14 +49,14 @@ type
     count    : integer;
     donotpage: boolean;
     nameonly : boolean;
-    procedure OnFileEntry(Name: String; Offset, UncompressedSize, ASection: Integer);
+    procedure OnFileEntry(Name: RTLString; Offset, UncompressedSize, ASection: Integer);
   end;
 
    TExtractAllObject = class
     basedir : string;
     r       : TChmReader;
     lastone_was_point : boolean;
-    procedure OnFileEntry(Name: String; Offset, UncompressedSize, ASection: Integer);
+    procedure OnFileEntry(Name: RTLString; Offset, UncompressedSize, ASection: Integer);
   end;
 
 Type
@@ -197,7 +197,7 @@ end;
 
 var donotshowoffset : boolean=false;
 
-procedure TListObject.OnFileEntry(Name: String; Offset, UncompressedSize,
+procedure TListObject.OnFileEntry(Name: RTLString; Offset, UncompressedSize,
   ASection: Integer);
 begin
   Inc(Count);
@@ -225,7 +225,7 @@ begin
   WriteLn(Name);
 end;
 
-procedure TExtractAllObject.OnFileEntry(Name: String; Offset, UncompressedSize,
+procedure TExtractAllObject.OnFileEntry(Name: RTLString; Offset, UncompressedSize,
   ASection: Integer);
 var mem : TMemoryStream;
     s   : String;