Changeset 441 for Generics

Timestamp:

Nov 19, 2012, 2:47:07 PM (12 years ago)

Author:

chronos

Message:

• Fixed: Wrong memory inicialization in TListObject results in error during other object assignment.

Location:

Generics/TemplateGenerics

Files:

• Additional/UBinarySerializer.pas (modified) (9 diffs)
• Generic/GenericFileList.inc (modified) (3 diffs)
• Generic/GenericList.inc (modified) (4 diffs)
• Generic/GenericListObject.inc (modified) (1 diff)
• Specialized/SpecializedList.pas (modified) (3 diffs)

Generics/TemplateGenerics/Additional/UBinarySerializer.pas

@@ -25 +25 @@
     Position: Integer;
     OwnsList: Boolean;
-    procedure Write(var Buffer; Count: Integer); inline;
-    procedure Read(var Buffer; Count: Integer); inline;
+    procedure Write(var Buffer; Count: Integer); //inline;
+    procedure Read(var Buffer; Count: Integer); //inline;
 
     procedure Assign(Source: TBinarySerializer);
@@ -73 +73 @@
   StringLength: Longint;
 begin
-  FList.ReadBuffer(StringLength, SizeOf(StringLength));
+  StringLength := 0;
+  Read(StringLength, SizeOf(StringLength));
   Result := ReadString(StringLength);
 end;
@@ -102 +103 @@
 function TBinarySerializer.ReadByte: Byte;
 begin
+  Result := 0;
   Read(Result, SizeOf(Byte));
 end;
@@ -107 +109 @@
 function TBinarySerializer.ReadCardinal: Cardinal;
 begin
+  Result := 0;
   Read(Result, SizeOf(Cardinal));
   if SwapData then Result := SwapEndian(Result);
@@ -113 +116 @@
 function TBinarySerializer.ReadInt64: Int64;
 begin
+  Result := 0;
   Read(Result, SizeOf(Int64));
   if SwapData then Result := SwapEndian(Result);
@@ -129 +133 @@
   Count: Byte;
 begin
+  Count := 0;
   Read(Count, 1);
   Result := ReadString(Count);
@@ -223 +228 @@
 function TBinarySerializer.ReadDouble: Double;
 begin
+  Result := 0;
   Read(Result, SizeOf(Double));
 end;
@@ -228 +234 @@
 function TBinarySerializer.ReadSingle: Single;
 begin
+  Result := 0;
   Read(Result, SizeOf(Single));
 end;
@@ -233 +240 @@
 function TBinarySerializer.ReadWord: Word;
 begin
+  Result := 0;
   Read(Result, SizeOf(Word));
   if SwapData then Result := SwapEndian(Result);

Generics/TemplateGenerics/Generic/GenericFileList.inc

@@ -15 +15 @@
     procedure SetFileName(const Value: string);
     procedure SetMode(const Value: Word);
+    function GetOpenned: Boolean;
   public
     constructor Create; override;
@@ -22 +23 @@
     property FileName: string read FFileName write SetFileName;
     property Mode: Word read FMode write SetMode;
+    property Openned: Boolean read GetOpenned;
   end;
 
@@ -81 +83 @@
 end;
 
+function TGFileList.GetOpenned: Boolean;
+begin
+  Result := FHandle <> feInvalidHandle;
+end;
 
 {$UNDEF IMPLEMENTATION}

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -39 +39 @@
     procedure SetFirst(AValue: TGListItem);
     procedure QuickSort(L, R : TGListIndex; Compare: TSortCompare);
+    procedure DoUpdate;
   protected
     procedure Put(Index: TGListIndex; const AValue: TGListItem); virtual;
@@ -109 +110 @@
 begin
   FCount := 0;
+  FUpdateCount := 0;
 end;
 
@@ -341 +343 @@
   if (Index < 0) or (Index > FCount) then
     raise EListError.CreateFmt(SListIndexError, [Index]);
-  InsertCount(Index, 1);
-  FItems[Index] := Item;
-  Update;
+  try
+    BeginUpdate;
+    InsertCount(Index, 1);
+    FItems[Index] := Item;
+  finally
+    EndUpdate;
+  end;
 end;
 
@@ -564 +570 @@
 procedure TGList.EndUpdate;
 begin
-  Dec(FUpdateCount);
-  Update;
+  if FUpdateCount > 0 then Dec(FUpdateCount);
+  if FUpdateCount = 0 then DoUpdate;
+end;
+
+procedure TGList.DoUpdate;
+begin
+  if Assigned(FOnUpdate) then FOnUpdate(Self);
 end;
 
 procedure TGList.Update;
 begin
-  if Assigned(FOnUpdate) and (FUpdateCount = 0) then FOnUpdate(Self);
+  if FUpdateCount = 0 then DoUpdate;
 end;
 

Generics/TemplateGenerics/Generic/GenericListObject.inc

@@ -88 +88 @@
     end;
   end;
+  I := FCount;
   inherited;
+  // Nil newly allocated items
+  while I < AValue do begin
+    FItems[I] := nil;
+    I := I + 1;
+  end;
 end;
 

Generics/TemplateGenerics/Specialized/SpecializedList.pas

@@ -67 +67 @@
   procedure AddStream(Stream: TStream);
   procedure AddStreamPart(Stream: TStream; ItemCount: TGListIndex);
-  procedure WriteBuffer(var Buffer; Count: Integer);
-  procedure ReadBuffer(var Buffer; Count: Integer);
 end;
 
@@ -333 +331 @@
   I: TGListIndex;
 begin
-  I := 0;
-  while (I < Count) do begin
+  I := Count - 1;
+  while (I >= 0) do begin
     TNotifyEvent(Items[I])(Sender);
-    I := I + 1;
+    I := I - 1;
   end;
 end;
@@ -414 +412 @@
 end;
 
-procedure TListByte.WriteBuffer(var Buffer; Count: Integer);
-begin
-
-end;
-
-procedure TListByte.ReadBuffer(var Buffer; Count: Integer);
-begin
-
-end;
-
 
 end.