Changeset 24 for trunk/Packages

Timestamp:

Nov 19, 2012, 12:31:19 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Ladění komunikačního protokolu s terminálem BF-630.

Location:

trunk/Packages

Files:

• PinConnection/UCommTCPServer.pas (modified) (1 diff)
• TemplateGenerics/Additional/UBinarySerializer.pas (modified) (5 diffs)

trunk/Packages/PinConnection/UCommTCPServer.pas

@@ -75 +75 @@
     Mem := TMemoryStream.Create;
     Stream.WriteToStream(Mem);
+    Mem.Position := 0;
     Socket.SendStreamRaw(Mem);
   finally

trunk/Packages/TemplateGenerics/Additional/UBinarySerializer.pas

@@ -31 +31 @@
     procedure WriteByte(Data: Byte);
     procedure WriteWord(Data: Word);
+    procedure WriteInteger(Data: Integer);
     procedure WriteCardinal(Data: Cardinal);
     procedure WriteInt64(Data: Int64);
@@ -44 +45 @@
     function ReadByte: Byte;
     function ReadWord: Word;
+    function ReadInteger: Integer;
     function ReadCardinal: Cardinal;
     function ReadInt64: Int64;
@@ -169 +171 @@
   Buffer: array of Byte;
 begin
-  if Count > (List.Count - StartIndex) then Count := (List.Count - StartIndex); // Limit max. stream size
+  //if Count > (List.Count - StartIndex) then
+  //  Count := (List.Count - StartIndex); // Limit max. stream size
+  List.Count := Count;
   if Count > 0 then begin
     SetLength(Buffer, Count);
@@ -242 +246 @@
   Result := 0;
   Read(Result, SizeOf(Word));
+  if SwapData then Result := SwapEndian(Result);
+end;
+
+function TBinarySerializer.ReadInteger: Integer;
+begin
+  Result := 0;
+  Read(Result, SizeOf(Integer));
   if SwapData then Result := SwapEndian(Result);
 end;
@@ -376 +387 @@
 end;
 
+procedure TBinarySerializer.WriteInteger(Data: Integer);
+begin
+  if SwapData then Data := SwapEndian(Data);
+  Write(Data, SizeOf(Integer));
+end;
+
 end.