more buffer fixes (?)

[d2df-sdl.git] / src / engine / e_fixedbuffer.pas

diff --git a/src/engine/e_fixedbuffer.pas b/src/engine/e_fixedbuffer.pas
index 92c984c9d6115165241836d2b8778a540503a062..bc355b1c671884e888ed025927592aec10c88387 100644 (file)
--- a/src/engine/e_fixedbuffer.pas
+++ b/src/engine/e_fixedbuffer.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE e_amodes.inc}
 unit e_fixedbuffer;
 
 interface
@@ -28,7 +28,7 @@ type
     Data: array [0..BUF_SIZE] of Byte; // îäèí áàéò ñâåðõó íà âñÿêèé ñëó÷àé
     ReadPos: Cardinal;
     WritePos: Cardinal;
-    Len: Cardinal;
+    Cap: Cardinal;
   end;
   pTBuffer = ^TBuffer;
 
@@ -57,6 +57,8 @@ procedure e_Buffer_Write(B: pTBuffer; V: string); overload;
 
 procedure e_Buffer_Write(B: pTBuffer; V: TMD5Digest); overload;
 
+procedure e_Buffer_Write(B: pTBuffer; V: pTBuffer); overload;
+
 
 function  e_Buffer_Read_Char(B: pTBuffer): Char;
 
@@ -100,15 +102,15 @@ procedure e_Buffer_Clear(B: pTBuffer);
 begin
   B^.WritePos := 0;
   B^.ReadPos := 0;
-  B^.Len := 0;
+  B^.Cap := 0;
 end;
 
 
 procedure e_Buffer_Write_Generic(B: pTBuffer; var V; N: Cardinal);
 begin
   if (B^.WritePos + N >= BUF_SIZE) then Exit;
-  if (B^.WritePos + N > B^.Len) then
-    B^.Len := B^.WritePos + N + 1;
+  if (B^.WritePos + N > B^.Cap) then
+    B^.Cap := B^.WritePos + N + 1;
 
   CopyMemory(Pointer(NativeUInt(Addr(B^.Data)) + B^.WritePos),
              @V, N);
@@ -177,7 +179,7 @@ begin
     P := BUF_SIZE;
   end;
 
-  if (P > B^.Len) then B^.Len := P;
+  if (P > B^.Cap) then B^.Cap := P;
 
   CopyMemory(Pointer(NativeUInt(Addr(B^.Data)) + B^.WritePos),
              @V[1], Len);
@@ -193,6 +195,27 @@ begin
     e_Buffer_Write(B, V[I]);
 end;
 
+procedure e_Buffer_Write(B: pTBuffer; V: pTBuffer); overload;
+var
+  N: Cardinal;
+begin
+  if V = nil then Exit;
+  N := V^.WritePos;
+  Assert(N <> 0, 'don''t write empty buffers you fuck');
+  if N = 0 then Exit;
+
+  e_Buffer_Write(B, Word(N));
+
+  if (B^.WritePos + N >= BUF_SIZE) then Exit;
+  if (B^.WritePos + N > B^.Cap) then
+    B^.Cap := B^.WritePos + N + 1;
+
+  CopyMemory(Pointer(NativeUInt(Addr(B^.Data)) + B^.WritePos),
+             Addr(V^.Data), N);
+
+  B^.WritePos := B^.WritePos + N;
+end;
+
 
 function e_Buffer_Read_Char(B: pTBuffer): Char;
 begin
@@ -237,8 +260,8 @@ begin
   Result := '';
   if Len = 0 then Exit;
 
-  if B^.ReadPos + Len > B^.Len then
-    Len := B^.Len - B^.ReadPos;
+  if B^.ReadPos + Len > B^.Cap then
+    Len := B^.Cap - B^.ReadPos;
 
   SetLength(Result, Len);
   CopyMemory(@Result[1], Pointer(NativeUInt(Addr(B^.Data)) + B^.ReadPos), Len);