X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2FBinEditor.pas;h=9c5f21df650b2772b77eb7f4f557d3bec4c483c8;hb=3dc2fe6b3d29cd54425db8f590e922f2dce50e99;hp=f59d4f3a5f2fb3c64fe748aecb963e133bf64441;hpb=b72e164f0fb64e3301ae8ca217449daf6a9d301d;p=d2df-editor.git

diff --git a/src/shared/BinEditor.pas b/src/shared/BinEditor.pas
index f59d4f3..9c5f21d 100644
--- a/src/shared/BinEditor.pas
+++ b/src/shared/BinEditor.pas
@@ -99,7 +99,7 @@ procedure ZeroMemory(Dest: Pointer; Len: Cardinal);
 Implementation
 
 Uses
-  Math, e_log;
+  Math, e_log, utils;
 
 Const
   MAX_BIN_SIZE = 4 * 1024 * 1024; // 4 MB
@@ -150,7 +150,7 @@ begin
   if (FPosition + varSize) > FSize then
     ExtendMemory(varSize);
 
-  CopyMemory(Pointer(Cardinal(FData) + FPosition),
+  CopyMemory(Pointer(PtrUInt(FData) + FPosition),
              @x, varSize);
   FPosition := FPosition + varSize;
 end;
@@ -240,13 +240,13 @@ begin
     ExtendMemory(SizeOf(Byte) + len);
 
 // Äëèíà ñòðîêè:
-  CopyMemory(Pointer(Cardinal(FData) + FPosition),
+  CopyMemory(Pointer(PtrUInt(FData) + FPosition),
              @len, SizeOf(Byte));
   FPosition := FPosition + SizeOf(Byte);
 // Ñòðîêà:
   if len > 0 then
   begin
-    CopyMemory(Pointer(Cardinal(FData) + FPosition),
+    CopyMemory(Pointer(PtrUInt(FData) + FPosition),
                @x[1], len);
     FPosition := FPosition + len;
   end;
@@ -258,13 +258,13 @@ begin
     ExtendMemory(SizeOf(Cardinal) + memSize);
 
 // Äëèíà áëîêà ïàìÿòè:
-  CopyMemory(Pointer(Cardinal(FData) + FPosition),
+  CopyMemory(Pointer(PtrUInt(FData) + FPosition),
              @memSize, SizeOf(Cardinal));
   FPosition := FPosition + SizeOf(Cardinal);
 // Áëîê ïàìÿòè:
   if memSize > 0 then
   begin
-    CopyMemory(Pointer(Cardinal(FData) + FPosition),
+    CopyMemory(Pointer(PtrUInt(FData) + FPosition),
                x, memSize);
     FPosition := FPosition + memSize;
   end;
@@ -277,7 +277,7 @@ begin
 
   if aLen > 0 then
   begin
-    FillMemory(Pointer(Cardinal(FData) + FPosition),
+    FillMemory(Pointer(PtrUInt(FData) + FPosition),
                aLen, aFillSym);
     FPosition := FPosition + aLen;
   end;
@@ -338,7 +338,7 @@ begin
   if (FPosition + varSize) <= FSize then
     begin
       CopyMemory(@x,
-                 Pointer(Cardinal(FData) + FPosition),
+                 Pointer(PtrUInt(FData) + FPosition),
                  varSize);
       FPosition := FPosition + varSize;
     end
@@ -403,7 +403,7 @@ begin
     begin
     // Äëèíà ñòðîêè:
       CopyMemory(@len,
-                 Pointer(Cardinal(FData) + FPosition),
+                 Pointer(PtrUInt(FData) + FPosition),
                  SizeOf(Byte));
          
       if (FPosition + SizeOf(Byte) + len) <= FSize then
@@ -414,7 +414,7 @@ begin
           if len > 0 then
             begin
               CopyMemory(@x[1],
-                         Pointer(Cardinal(FData) + FPosition),
+                         Pointer(PtrUInt(FData) + FPosition),
                          len);
               FPosition := FPosition + len;
             end
@@ -434,7 +434,7 @@ begin
     begin
     // Äëèíà áëîêà ïàìÿòè:
       CopyMemory(@memSize,
-                 Pointer(Cardinal(FData) + FPosition),
+                 Pointer(PtrUInt(FData) + FPosition),
                  SizeOf(Cardinal));
 
       if (FPosition + SizeOf(Cardinal) + memSize) <= FSize then
@@ -445,7 +445,7 @@ begin
             begin
               GetMem(x, memSize);
               CopyMemory(x,
-                         Pointer(Cardinal(FData) + FPosition),
+                         Pointer(PtrUInt(FData) + FPosition),
                          memSize);
               FPosition := FPosition + memSize;
             end
@@ -536,7 +536,7 @@ begin
 
   if (not FileExists(aFileName)) or (aOverWrite) then
   begin
-    AssignFile(FHandle, aFileName);
+    AssignFile(FHandle, findFileCIStr(aFileName));
     ReWrite(FHandle, 1);
 
   // Ñèãíàòóðà:
@@ -607,7 +607,7 @@ begin
 
   if FileExists(aFileName) then
   begin
-    AssignFile(FHandle, aFileName);
+    AssignFile(FHandle, findFileCIStr(aFileName));
     ReSet(FHandle, 1);
 
   // Ñèãíàòóðà: