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

git-svn-id: trunk@38469 -

components/lazutils/fileutil.inc

@@ -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

designer/framedesigner.pas

@@ -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

ide/customformeditor.pp

@@ -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

ideintf/formeditingintf.pas

@@ -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;
+  LongRec(Result).Lo:=Word(ALeft);
-  LazLongRec(Result).Hi:=ATop;
+  LongRec(Result).Hi:=Word(ATop);
 end;
 
 procedure DesignInfoToLeftTop(ADesignInfo: LongInt; out ALeft, ATop: SmallInt);
 begin
-  ALeft := LazLongRec(ADesignInfo).Lo;
+  ALeft := SmallInt(LongRec(ADesignInfo).Lo);
-  ATop := LazLongRec(ADesignInfo).Hi;
+  ATop := SmallInt(LongRec(ADesignInfo).Hi);
 end;
 
 { TDesignerMediator }

lcl/include/customframe.inc

@@ -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,

lcl/lclclasses.pp

@@ -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)