* Fixes for unicode rtl

This commit is contained in:
Michaël Van Canneyt 2024-12-13 14:40:35 +01:00
parent a8ccf71bd0
commit c29fb28bda

View File

@ -226,8 +226,8 @@ Type
FWatch : TCustomDirwatch; FWatch : TCustomDirwatch;
Protected Protected
procedure ConstructList(const aBaseDir, aDir: String; aList: TFPStringHashTable); procedure ConstructList(const aBaseDir, aDir: String; aList: TFPStringHashTable);
procedure DoCheckItem(Item: String; const Key: string; var Continue: Boolean); procedure DoCheckItem(Item: AnsiString; const Key: Ansistring; var Continue: Boolean);
procedure DoDeletedItem(Item: String; const Key: string; var Continue: Boolean); procedure DoDeletedItem(Item: AnsiString; const Key: Ansistring; var Continue: Boolean);
procedure InitWatch; procedure InitWatch;
function Check : cardinal; function Check : cardinal;
Public Public
@ -642,7 +642,8 @@ begin
end end
until FindNext(Info)<>0; until FindNext(Info)<>0;
finally finally
Sysutils.FindClose(Info);
{$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Sysutils.FindClose(Info);
end; end;
end; end;
@ -693,7 +694,7 @@ begin
FCount:=0; FCount:=0;
end; end;
procedure TDirListDriver.TDirData.DoDeletedItem(Item: String; const Key: string; var Continue: Boolean); procedure TDirListDriver.TDirData.DoDeletedItem(Item: AnsiString; const Key: Ansistring; var Continue: Boolean);
Var Var
lEvent : TFileChangeEvent; lEvent : TFileChangeEvent;
@ -707,7 +708,7 @@ begin
Continue:=Not Watch.Terminated; Continue:=Not Watch.Terminated;
end; end;
procedure TDirListDriver.TDirData.DoCheckItem(Item: String; const Key: string; var Continue: Boolean); procedure TDirListDriver.TDirData.DoCheckItem(Item: AnsiString; const Key: Ansistring; var Continue: Boolean);
Var Var
S : String; S : String;