From 41cba2bb5e0848a0baee2d5e570077597d4abbce Mon Sep 17 00:00:00 2001 From: dmitry Date: Thu, 2 Sep 2010 18:34:56 +0000 Subject: [PATCH] lcl: fix range checking error in win FileUtils, reported at #15642 git-svn-id: trunk@27251 - --- lcl/include/unixfileutil.inc | 1 + lcl/include/winfileutil.inc | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lcl/include/unixfileutil.inc b/lcl/include/unixfileutil.inc index 633198a889..0e0e2b6416 100644 --- a/lcl/include/unixfileutil.inc +++ b/lcl/include/unixfileutil.inc @@ -1,3 +1,4 @@ +{%MainUnit ../filectrl.pp} {------------------------------------------------------------------------------ procedure CheckIfFileIsExecutable(const AFilename: string); ------------------------------------------------------------------------------} diff --git a/lcl/include/winfileutil.inc b/lcl/include/winfileutil.inc index d35878b811..9a0a2d2498 100644 --- a/lcl/include/winfileutil.inc +++ b/lcl/include/winfileutil.inc @@ -1,3 +1,4 @@ +{%MainUnit ../filectrl.pp} {------------------------------------------------------------------------------ procedure CheckIfFileIsExecutable(const AFilename: string); ------------------------------------------------------------------------------} @@ -285,7 +286,7 @@ begin FindWideToAnsi(wide, Rslt.FindData); Result := FindMatch(Rslt); end else - Result := GetLastError; + Result := Integer(GetLastError); end; {------------------------------------------------------------------------------ @@ -312,7 +313,7 @@ end; function FileGetAttrWide(const FileName: String): Longint; begin - Result:=Windows.GetFileAttributesW(PWideChar(UTF8Decode(FileName))); + Result:=Integer(Windows.GetFileAttributesW(PWideChar(UTF8Decode(FileName)))); end; {------------------------------------------------------------------------------ @@ -328,7 +329,7 @@ begin if Windows.SetFileAttributesW(PWideChar(UTF8Decode(FileName)), Attr) then Result:=0 else - Result := Windows.GetLastError; + Result := Integer(Windows.GetLastError); end; {------------------------------------------------------------------------------