X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_fixedbuffer.pas;h=bc355b1c671884e888ed025927592aec10c88387;hb=907f02bbf5d1e65c2ce052d883d522e30e7c7a8f;hp=e71445f08a171eed516a0416b060a1b7fc0c8b62;hpb=5472594f32e33da0c66606ec9eebc8f798ef6b54;p=d2df-sdl.git

diff --git a/src/engine/e_fixedbuffer.pas b/src/engine/e_fixedbuffer.pas
index e71445f..bc355b1 100644
--- 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,17 +102,17 @@ 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(Cardinal(Addr(B^.Data)) + B^.WritePos),
+  CopyMemory(Pointer(NativeUInt(Addr(B^.Data)) + B^.WritePos),
              @V, N);
 
   B^.WritePos := B^.WritePos + N;
@@ -119,7 +121,7 @@ procedure e_Buffer_Read_Generic(B: pTBuffer; var V; N: Cardinal);
 begin
   if (B^.ReadPos + N >= BUF_SIZE) then Exit;
 
-  CopyMemory(@V, Pointer(Cardinal(Addr(B^.Data)) + B^.ReadPos), N);
+  CopyMemory(@V, Pointer(NativeUInt(Addr(B^.Data)) + B^.ReadPos), N);
 
   B^.ReadPos := B^.ReadPos + N;
 end;
@@ -177,9 +179,9 @@ begin
     P := BUF_SIZE;
   end;
 
-  if (P > B^.Len) then B^.Len := P;
+  if (P > B^.Cap) then B^.Cap := P;
 
-  CopyMemory(Pointer(Cardinal(Addr(B^.Data)) + B^.WritePos),
+  CopyMemory(Pointer(NativeUInt(Addr(B^.Data)) + B^.WritePos),
              @V[1], Len);
 
   B^.WritePos := P;
@@ -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,11 +260,11 @@ 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(Cardinal(Addr(B^.Data)) + B^.ReadPos), Len);
+  CopyMemory(@Result[1], Pointer(NativeUInt(Addr(B^.Data)) + B^.ReadPos), Len);
 
   B^.ReadPos := B^.ReadPos + Len;
 end;
@@ -256,7 +279,7 @@ end;
 
 procedure e_Raw_Read_Generic(P: Pointer; var V; N: Cardinal);
 begin
-  CopyMemory(@V, Pointer(Cardinal(P) + RawPos), N);
+  CopyMemory(@V, Pointer(NativeUInt(P) + RawPos), N);
 
   RawPos := RawPos + N;
 end;
@@ -301,7 +324,7 @@ begin
   if Len = 0 then Exit;
 
   SetLength(Result, Len);
-  CopyMemory(@Result[1], Pointer(Cardinal(P) + RawPos), Len);
+  CopyMemory(@Result[1], Pointer(NativeUInt(P) + RawPos), Len);
 
   RawPos := RawPos + Len;
 end;