paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-26 05:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

LazFileUtils: fix FileSetDateUTF8 on Windows when FileName contains unicode

Browse Source 
characters outside current codepage.

git-svn-id: trunk@41289 -
This commit is contained in:
bart 2013-05-19 12:52:48 +00:00
parent d1e6e77a05
commit 280b9f2060
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/lazutils/lazfileutils.pas
View File

@ -1088,11 +1088,7 @@ begin
SysUtils.FindClose(F);
end;
function FileSetDateUTF8(const FileName: String; Age: Longint): Longint;
begin
Result:=SysUtils.FileSetDate(UTF8ToSys(Filename),Age);
InvalidateFileStateCache(Filename);
end;
function DeleteFileUTF8(const FileName: String): Boolean;
begin

6
components/lazutils/unixlazfileutils.inc
View File

@ -51,6 +51,12 @@ begin
Result:=SysUtils.FileAge(UTF8ToSys(Filename));
end;
function FileSetDateUTF8(const FileName: String; Age: Longint): Longint;
begin
Result := SysUtils.FileSetDate(UTF8ToSys(Filename), Age);
InvalidateFileStateCache(Filename);
end;
function ExpandFileNameUtf8(const FileName: string; {const} BaseDir: String = ''): String;
var
IsAbs: Boolean;

38
components/lazutils/winlazfileutils.inc
View File

@ -6,7 +6,7 @@ var
//They are intialized in InitLazFileUtils
_FileAgeUtf8 : function (const Filename:string):Longint;
//FileSize_ : function (const Filename: string): int64;
//FileSetDate_ : function (const FileName: String; Age: Longint): Longint;
_FileSetDateUtf8 : function (const FileName: String; Age: Longint): Longint;
//FindFirst_ : function (const Path: string; Attr: Longint;
// out Rslt: TSearchRec): Longint;
//FindNext_ : function (var Rslt: TSearchRec): Longint;
@ -208,6 +208,12 @@ begin
Result := _FileAgeUtf8(FileName);
end;
function FileSetDateUTF8(const FileName: String; Age: Longint): Longint;
begin
Result := _FileSetDateUtf8(Filename, Age);
InvalidateFileStateCache(Filename);
end;
{******* ANSI functions *******}
@ -253,6 +259,13 @@ begin
Result := SysUtils.FileAge(UTF8ToSys(Filename));
end;
function FileSetDateAnsi(const FileName: String; Age: Longint): Longint;
begin
Result := SysUtils.FileSetDate(UTF8ToSys(Filename), Age);
end;
{$endif WinCE}
@ -401,6 +414,25 @@ begin
Result := -1;
end;
function FileSetDateWide(const FileName: String; Age: Longint): Longint;
var
FT:TFileTime;
fh: HANDLE;
begin
try
fh := CreateFileW(PWideChar(UTF8ToUTF16(FileName)),
FILE_WRITE_ATTRIBUTES,
0, nil, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, 0);
if (fh <> feInvalidHandle) and (DosToWinTime(Age,FT) and SetFileTime(fh, nil, nil, @FT)) then
Result := 0
else
Result := GetLastError;
finally
if (fh <> feInvalidHandle) then FileClose(fh);
end;
end;
procedure InitLazFileUtils;
@ -410,7 +442,7 @@ begin
begin
_FileAgeUtf8 := @FileAgeAnsi;
//FileSize_ := @FileSizeAnsi;
//FileSetDate_ := @FileSetDateAnsi;
_FileSetDateUtf8 := @FileSetDateAnsi;
_FileGetAttrUtf8 := @FileGetAttrAnsi;
_FileSetAttrUtf8 := @FileSetAttrAnsi;
//DeleteFile_ := @DeleteFileAnsi;
@ -431,7 +463,7 @@ begin
begin
_FileAgeUtf8 := @FileAgeWide;
//FileSize_ := @FileSizeWide;
//FileSetDate_ := @FileSetDateWide;
_FileSetDateUtf8 := @FileSetDateWide;
_FileGetAttrUtf8 := @FileGetAttrWide;
_FileSetAttrUtf8 := @FileSetAttrWide;
//DeleteFile_ := @DeleteFileWide;