diff --git a/src/engine/e_msg.pas b/src/engine/e_msg.pas
index 1ed3809b3f313c857b086a2e906a00c512875f83..bb7347740bd950401a0bfc4d49626b41c6884069 100644 (file)
--- a/src/engine/e_msg.pas
+++ b/src/engine/e_msg.pas
CurSize: Integer;
ReadCount: Integer;
Bit: Integer;
+ AllocStep: Integer;
OwnMemory: Boolean;
function Init(V: Pointer; N: Integer; Full: Boolean = False): Boolean;
function AssignBuffer(P: Pointer; N: Integer; Full: Boolean = False): Boolean;
procedure BeginReading();
+ procedure Seek(Pos: Integer);
+ procedure Skip(Size: Integer);
+ function BytesLeft(): Integer;
function ReadData(V: Pointer; N: Integer): Integer;
function ReadChar(): Char;
function ReadByte(): Byte;
procedure Write(V: Int64); overload;
procedure Write(V: String); overload;
procedure Write(V: TMD5Digest); overload;
+ procedure Write(V: TMsg);
end;
type
if P = nil then
raise Exception.Create('TMsg.Alloc: no mem');
Init(P, N);
+ AllocStep := N;
OwnMemory := True;
end;
begin
if not OwnMemory then
raise Exception.Create('TMsg.Free: called on borrowed memory');
+ Clear();
OwnMemory := False;
FreeMem(Data);
Data := nil;
end;
procedure TMsg.WriteData(V: Pointer; N: Integer);
+var
+ NewSize: Integer;
begin
if CurSize + N > MaxSize then
begin
- Overflow := True;
- raise Exception.Create('TMsg.WriteData: buffer overrun!');
- Exit;
+ if OwnMemory then
+ begin
+ NewSize := MaxSize + ((N + AllocStep) div AllocStep) * AllocStep; // round up
+ if ReAllocMem(Data, NewSize) = nil then
+ raise Exception.Create('TMsg.WriteData: out of memory on realloc');
+ MaxSize := NewSize;
+ end
+ else
+ begin
+ Overflow := True;
+ raise Exception.Create('TMsg.WriteData: buffer overrun on borrowed memory!');
+ end;
end;
+
Move(V^, (Data + CurSize)^, N);
CurSize := CurSize + N;
end;
+procedure TMsg.Write(V: TMsg);
+begin
+ WriteData(V.Data, V.CurSize);
+end;
+
procedure TMsg.Write(V: Byte); overload;
begin
WriteData(@V, 1);
procedure TMsg.Write(V: ShortInt); overload;
begin
- WriteData(@V, 2);
+ WriteData(@V, 1);
end;
procedure TMsg.Write(V: SmallInt); overload;
begin
- WriteData(@V, 1);
+ WriteData(@V, 2);
end;
procedure TMsg.Write(V: LongInt); overload;
Bit := 0;
end;
+procedure TMsg.Seek(Pos: Integer);
+begin
+ if Pos > CurSize then
+ raise Exception.Create('TMsg.Seek: buffer overrun!');
+ ReadCount := Pos;
+end;
+
+procedure TMsg.Skip(Size: Integer);
+begin
+ if ReadCount + Size > CurSize then
+ raise Exception.Create('TMsg.Skip: buffer overrun!');
+ ReadCount := ReadCount + Size;
+end;
+
+function TMsg.BytesLeft(): Integer;
+begin
+ Result := CurSize - ReadCount;
+end;
+
function TMsg.ReadData(V: Pointer; N: Integer): Integer;
begin
Result := 0;
function TMsg.ReadShortInt(): ShortInt;
begin
Result := 0;
- ReadData(@Result, 2);
+ ReadData(@Result, 1);
end;
function TMsg.ReadSmallInt(): SmallInt;
begin
Result := 0;
- ReadData(@Result, 1);
+ ReadData(@Result, 2);
end;
function TMsg.ReadLongInt(): LongInt;