Changeset 26 for MemoryStreamEx/UMemoryStreamEx.pas

Timestamp:

May 25, 2010, 1:51:46 PM (14 years ago)

Author:

george

Message:

• Přidáno: Knihovna VectorObject pro vykreslování vektorových objektů.
• Přidáno: Knihovna PersistentForm pro uchování stavu oken v registrech.
• Přidáno: LastOpenedList pro uchování naposledy otevřených souborů.
• Upraveno: Aktualizace různých knihoven.

File:

• MemoryStreamEx/UMemoryStreamEx.pas (modified) (9 diffs)

MemoryStreamEx/UMemoryStreamEx.pas

@@ -6 +6 @@
 
 uses
-  Classes, DateUtils;
+  Classes, DateUtils, syncobjs;
 
 type
@@ -23 +23 @@
     procedure WriteCardinal(Data: Cardinal);
     procedure WriteInt64(Data: Int64);
+    procedure WriteString(Data: string);
     procedure WriteShortString(Data: ShortString);
     procedure WriteAnsiString(Data: string);
     procedure WriteUnixTime(Data: TDateTime);
-    procedure WriteStream(Stream: TStream; Count: Integer);
     procedure WriteDouble(Value: Double);
     procedure WriteSingle(Value: Single);
+    procedure WriteStream(Stream: TStream; Count: Integer);
+    procedure WriteStreamPart(Stream: TStream; Count: Integer);
     function ReadByte: Byte;
     function ReadWord: Word;
     function ReadCardinal: Cardinal;
     function ReadInt64: Int64;
+    function ReadString: string;
     function ReadShortString: string;
     function ReadAnsiString: string;
+    function ReadStringTerminated(Terminator: string = #0): string;
     function ReadUnixTime: TDateTime;
     function ReadDouble: Double;
     function ReadSingle: Single;
     procedure ReadStream(var Stream: TStream; Count: Integer);
+    procedure ReadStreamPart(var Stream: TStream; Count: Integer);
+    function Sum: Byte;
+    procedure FillByte(Data: Byte; Count: Integer);
     constructor Create;
     property Endianness: TEndianness read FEndianness write SetEndianness;
   end;
 
+  { TThreadMemoryStreamEx }
+
+  TThreadMemoryStreamEx = class(TMemoryStreamEx)
+    Lock: TCriticalSection;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
 implementation
 
 { TMemoryStreamEx }
-
-procedure TMemoryStreamEx.WriteAnsiString(Data: string);
-var
-  StringLength: Longint;
-begin
-  StringLength := Length(Data);
-  Write(StringLength, SizeOf(StringLength));
-  Write(Data[1], StringLength);
-end;
 
 function TMemoryStreamEx.ReadAnsiString: string;
@@ -67 +73 @@
 end;
 
+function TMemoryStreamEx.ReadStringTerminated(Terminator: string = #0): string;
+var
+  Data: Char;
+  I: Integer;
+  OldPosition: Integer;
+begin
+  OldPosition := Position;
+  Result := '';
+  I := 1;
+  repeat
+    if Position >= Size then Break;
+    Data := Chr(ReadByte);
+    if Data <> Terminator[I] then Result := Result + Data
+      else Inc(I);
+  until I > Length(Terminator);
+  if not (I > Length(Terminator)) then begin
+    Result := '';
+    Position := OldPosition;
+  end;
+end;
+
 function TMemoryStreamEx.ReadByte: Byte;
 begin
@@ -82 +109 @@
   ReadBuffer(Result, SizeOf(Int64));
   if SwapData then Result := Swap(Result);
+end;
+
+function TMemoryStreamEx.ReadString:string;
+begin
+  SetLength(Result, Size - Position);
+  if (Size - Position) > 0 then
+    Read(Result[1], Size - Position)
+    else Result := '';
 end;
 
@@ -106 +141 @@
 end;
 
+procedure TMemoryStreamEx.ReadStreamPart(var Stream:TStream;Count:Integer);
+var
+  Buffer: array of Byte;
+begin
+  if Count > 0 then begin
+    SetLength(Buffer, Count);
+    ReadBuffer(Buffer[0], Count);
+    if Stream.Size < (Stream.Position + Count) then
+      Stream.Size := Stream.Position + Count;
+    Stream.Write(Buffer[0], Count);
+  end;
+end;
+
+procedure TMemoryStreamEx.WriteStreamPart(Stream:TStream;Count:Integer);
+var
+  Buffer: array of Byte;
+begin
+  if Count > Stream.Size then Count := Stream.Size; // Limit max. stream size
+  if Count > 0 then begin
+    SetLength(Buffer, Count);
+    Stream.Read(Buffer[0], Count);
+    Write(Buffer[0], Count);
+  end;
+end;
+
 constructor TMemoryStreamEx.Create;
 begin
@@ -124 +184 @@
 begin
   ReadBuffer(Result, SizeOf(Single));
+end;
+
+function TMemoryStreamEx.Sum: Byte;
+begin
+  Result := 0;
+  Position := 0;
+  while Position < Size do
+    Result := (Result + ReadByte) and $ff;
+end;
+
+procedure TMemoryStreamEx.FillByte(Data:Byte;Count:Integer);
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+    WriteByte(Data);
 end;
 
@@ -135 +211 @@
 begin
   FEndianness := AValue;
-  {$ifdef FPC_LITTLE_ENDIAN}
+  {$if defined(FPC_LITTLE_ENDIAN)}
   SwapData := FEndianness = enBig;
-  {$elseifdef FPC_BIG_ENDIAN}
+  {$elseif defined(FPC_BIG_ENDIAN)}
   SwapData := FEndianness = enLittle;
   {$endif}
 end;
 
+procedure TMemoryStreamEx.WriteAnsiString(Data: string);
+var
+  StringLength: Longint;
+begin
+  StringLength := Length(Data);
+  Write(StringLength, SizeOf(StringLength));
+  Write(Data[1], StringLength);
+end;
+
 procedure TMemoryStreamEx.WriteByte(Data: Byte);
 begin
@@ -157 +242 @@
   if SwapData then Data := Swap(Data);
   Write(Data, SizeOf(Int64));
+end;
+
+procedure TMemoryStreamEx.WriteString(Data:string);
+begin
+  if Length(Data) > 0 then
+    Write(Data[1], Length(Data));
 end;
 
@@ -202 +293 @@
 end;
 
+{ TThreadMemoryStreamEx }
+
+constructor TThreadMemoryStreamEx.Create;
+begin
+  inherited Create;
+  Lock := TCriticalSection.Create;
+end;
+
+destructor TThreadMemoryStreamEx.Destroy;
+begin
+  Lock.Destroy;
+  inherited Destroy;
+end;
+
 end.