paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-15 14:29:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert r38465 #f26e63161d and use typecasts to prevent range errors. Should fix issue #22760

Browse Source 
git-svn-id: trunk@38469 -
This commit is contained in:
juha 2012-08-31 22:38:46 +00:00
parent a9fc3bf413
commit 9b6e54b588
6 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazutils/fileutil.inc
View File

@ -101,7 +101,7 @@ function FileSetDateUTF8(const FileName: String; Age: Longint): Longint;
var
lft : TFileTime;
begin
ADosTimeToWinTime:=DosDateTimeToFileTime(longrec(DosTime).hi,longrec(DosTime).lo,@lft) and
ADosTimeToWinTime:=DosDateTimeToFileTime(LongRec(DosTime).hi,LongRec(DosTime).lo,@lft) and
LocalFileTimeToFileTime(lft,Wintime);
end;
var

2
designer/framedesigner.pas
View File

@ -164,7 +164,7 @@ begin
LookupRoot.DesignInfo := LeftTopToDesignInfo(Left, Top);
// always fill the whole designer form
TControl(LookupRoot).SetBounds(0, 0, Width, Height);
//DebugLn(['TFrameDesignerForm.DoSaveBounds ',Left,',',Top,' ',LazLongRec(LookupRoot.DesignInfo).Lo,',',LongRec(LookupRoot.DesignInfo).hi]);
//DebugLn(['TFrameDesignerForm.DoSaveBounds ',Left,',',Top,' ',LongRec(LookupRoot.DesignInfo).Lo,',',LongRec(LookupRoot.DesignInfo).hi]);
end
else
if LookupRoot <> nil then

2
ide/customformeditor.pp
View File

@ -1298,7 +1298,7 @@ begin
// no parent and not a form
AControl.SetBounds(0,0,CompWidth,CompHeight);
AControl.DesignInfo := LeftTopToDesignInfo(CompLeft, CompTop);
//DebugLn(['TCustomFormEditor.CreateComponent ',dbgsName(AControl),' ',LazLongRec(AControl.DesignInfo).Lo,',',LongRec(AControl.DesignInfo).Hi]);
//DebugLn(['TCustomFormEditor.CreateComponent ',dbgsName(AControl),' ',LongRec(AControl.DesignInfo).Lo,',',LongRec(AControl.DesignInfo).Hi]);
end;
end
else

14
ideintf/formeditingintf.pas
View File

@ -23,7 +23,7 @@ interface
uses
Math, Classes, SysUtils, LCLProc, TypInfo, types, Forms, Controls,
LCLClasses, ProjectIntf, ComponentEditors, ObjectInspector;
ProjectIntf, ComponentEditors, ObjectInspector;
const
ComponentPaletteImageWidth = 24;
@ -241,24 +241,24 @@ end;
function LeftFromDesignInfo(ADesignInfo: LongInt): SmallInt;
begin
Result := LazLongRec(ADesignInfo).Lo;
Result := SmallInt(LongRec(ADesignInfo).Lo);
end;
function TopFromDesignInfo(ADesignInfo: LongInt): SmallInt;
begin
Result := LazLongRec(ADesignInfo).Hi;
Result := SmallInt(LongRec(ADesignInfo).Hi);
end;
function LeftTopToDesignInfo(const ALeft, ATop: SmallInt): LongInt;
begin
LazLongRec(Result).Lo:=ALeft;
LazLongRec(Result).Hi:=ATop;
LongRec(Result).Lo:=Word(ALeft);
LongRec(Result).Hi:=Word(ATop);
end;
procedure DesignInfoToLeftTop(ADesignInfo: LongInt; out ALeft, ATop: SmallInt);
begin
ALeft := LazLongRec(ADesignInfo).Lo;
ATop := LazLongRec(ADesignInfo).Hi;
ALeft := SmallInt(LongRec(ADesignInfo).Lo);
ATop := SmallInt(LongRec(ADesignInfo).Hi);
end;
{ TDesignerMediator }

12
lcl/include/customframe.inc
View File

@ -40,7 +40,7 @@ var
Temp: LongInt;
begin
Temp:=DesignInfo;
LazLongRec(Temp).Lo:=Reader.ReadInteger;
LongRec(Temp).Lo:=Word(Reader.ReadInteger);
DesignInfo:=Temp;
end;
@ -49,18 +49,18 @@ var
Temp: LongInt;
begin
Temp:=DesignInfo;
LazLongRec(Temp).Hi:=Reader.ReadInteger;
LongRec(Temp).Hi:=Word(Reader.ReadInteger);
DesignInfo:=Temp;
end;
procedure TCustomFrame.WriteDesignLeft(Writer: TWriter);
begin
Writer.WriteInteger(LazLongRec(DesignInfo).Lo);
Writer.WriteInteger(LongInt(LongRec(DesignInfo).Lo));
end;
procedure TCustomFrame.WriteDesignTop(Writer: TWriter);
begin
Writer.WriteInteger(LazLongRec(DesignInfo).Hi);
Writer.WriteInteger(LongInt(LongRec(DesignInfo).Hi));
end;
class procedure TCustomFrame.WSRegisterClass;
@ -148,9 +148,9 @@ begin
Ancestor:=TComponent(Filer.Ancestor);
if Assigned(Ancestor) then Temp:=Ancestor.DesignInfo;
Filer.Defineproperty('DesignLeft',@ReadDesignLeft,@WriteDesignLeft,
(LazLongRec(DesignInfo).Lo<>LazLongrec(Temp).Lo));
(LongRec(DesignInfo).Lo<>LongRec(Temp).Lo));
Filer.Defineproperty('DesignTop',@ReadDesignTop,@WriteDesignTop,
(LazLongRec(DesignInfo).Hi<>LazLongrec(Temp).Hi));
(LongRec(DesignInfo).Hi<>LongRec(Temp).Hi));
end;
procedure TCustomFrame.CalculatePreferredSize(var PreferredWidth,

12
lcl/lclclasses.pp
View File

@ -33,18 +33,6 @@ uses
type
// SysUtils.LongRec has unsigned Word for Lo and Hi,
// we need a similar record with signed ShortInt
LazLongRec = packed record
case Integer of
{$ifdef FPC_LITTLE_ENDIAN}
0 : (Lo,Hi : ShortInt);
{$else FPC_LITTLE_ENDIAN}
0 : (Hi,Lo : ShortInt);
{$endif FPC_LITTLE_ENDIAN}
1 : (Bytes : Array[0..3] of Byte);
end;
{ TLCLComponent }
TLCLComponent = class(TComponent)