From 7e3ba1144977032e3b1beba522bff10ccaca0ed0 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 22 Nov 2004 23:24:24 +0000
Subject: [PATCH] fixed 1.0.10 compilation  from Vincent

git-svn-id: trunk@6286 -
---
 components/codetools/memcheck.pas | 41 +++++++++++++++++++++++++++++++
 designer/jitforms.pp              | 28 ++++++++++++++++-----
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/components/codetools/memcheck.pas b/components/codetools/memcheck.pas
index f5e52f8d35..8065a03678 100644
--- a/components/codetools/memcheck.pas
+++ b/components/codetools/memcheck.pas
@@ -880,23 +880,41 @@ procedure dumpheap;
 var
   pp : pheap_mem_info;
   i : ptrint;
+{$IFDEF HASGETHEAPSTATUS}
+  ExpectedHeapFree : ptrint;
+  status : THeapStatus;
+{$ELSE}
   ExpectedMemAvail : ptrint;
+{$ENDIF}
 begin
   pp:=heap_mem_root;
   Writeln(ptext^,'Heap dump by heaptrc unit');
   Writeln(ptext^,getmem_cnt, ' memory blocks allocated : ',getmem_size,'/',getmem8_size);
   Writeln(ptext^,freemem_cnt,' memory blocks freed     : ',freemem_size,'/',freemem8_size);
   Writeln(ptext^,getmem_cnt-freemem_cnt,' unfreed memory blocks : ',getmem_size-freemem_size);
+{$IFDEF HASGETHEAPSTATUS}
+  SysGetHeapStatus(status);
+  Write(ptext^,'True heap size : ',status.CurrHeapSize);
+{$ELSE}
   Write(ptext^,'True heap size : ',system.HeapSize);
+{$ENDIF}
   if EntryMemUsed > 0 then
     Writeln(ptext^,' (',EntryMemUsed,' used in System startup)')
   else
     Writeln(ptext^);
+{$IFDEF HASGETHEAPSTATUS}
+  Writeln(ptext^,'True free heap : ',status.CurrHeapFree);
+  ExpectedHeapFree:=status.CurrHeapSize-(getmem8_size-freemem8_size)-
+    (getmem_cnt-freemem_cnt)*(sizeof(theap_mem_info)+extra_info_size)-EntryMemUsed;
+  If ExpectedHeapFree<>status.CurrHeapFree then
+    Writeln(ptext^,'Should be : ',ExpectedHeapFree);
+{$ELSE}
   Writeln(ptext^,'True free heap : ',MemAvail);
   ExpectedMemAvail:=system.HeapSize-(getmem8_size-freemem8_size)-
     (getmem_cnt-freemem_cnt)*(sizeof(theap_mem_info)+extra_info_size)-EntryMemUsed;
   If ExpectedMemAvail<>MemAvail then
     Writeln(ptext^,'Should be : ',ExpectedMemAvail);
+{$ENDIF}
   i:=getmem_cnt-freemem_cnt;
   while pp<>nil do
    begin
@@ -963,6 +981,12 @@ end;
                             No specific tracing calls
 *****************************************************************************}
 
+{$IFDEF HASGETHEAPSTATUS}
+procedure TraceGetHeapStatus(var status:THeapStatus);
+begin
+  SysGetHeapStatus(status);
+end;
+{$ELSE}
 function TraceMemAvail:ptrint;
 begin
   TraceMemAvail:=SysMemAvail;
@@ -977,6 +1001,7 @@ function TraceHeapSize:ptrint;
 begin
   TraceHeapSize:=SysHeapSize;
 end;
+{$ENDIF}
 
 
 {*****************************************************************************
@@ -1027,15 +1052,28 @@ const
     AllocMem : @TraceAllocMem;
     ReAllocMem : @TraceReAllocMem;
     MemSize : @TraceMemSize;
+{$IFDEF HASGETHEAPSTATUS}
+    GetHeapStatus : @TraceGetHeapStatus;
+{$ELSE}
     MemAvail : @TraceMemAvail;
     MaxAvail : @TraceMaxAvail;
     HeapSize : @TraceHeapsize;
+{$ENDIF}
   );
 
 
 procedure TraceInit;
+{$IFDEF HASGETHEAPSTATUS}
+var
+  initheapstatus : THeapStatus;
+{$ENDIF}
 begin
+{$IFDEF HASGETHEAPSTATUS}
+  SysGetHeapStatus(initheapstatus);
+  EntryMemUsed:=initheapstatus.CurrHeapUsed;
+{$ELSE}
   EntryMemUsed:=System.HeapSize-MemAvail;
+{$ENDIF}
   MakeCRC32Tbl;
   SetMemoryManager(TraceManager);
   ptext:=@stderr;
@@ -2321,6 +2359,9 @@ end.
 
 {
   $Log$
+  Revision 1.37  2004/11/22 23:24:24  mattias
+  fixed 1.0.10 compilation  from Vincent
+
   Revision 1.36  2004/11/10 15:25:32  mattias
   updated memcheck.pas from heaptrc.pp
 
diff --git a/designer/jitforms.pp b/designer/jitforms.pp
index f5169ce6e2..50ceed955d 100644
--- a/designer/jitforms.pp
+++ b/designer/jitforms.pp
@@ -261,7 +261,7 @@ var
   i: Integer;
 begin
   for i:=0 to 1000 do begin
-    if PPointer(AClass)[i]=MethodPointer then begin
+    if PPointer(pointer(AClass))[i]=MethodPointer then begin
       Result:=i*SizeOf(Pointer);
       exit;
     end;
@@ -313,17 +313,33 @@ begin
     Designer.ValidateRename(AComponent, CurName, NewName);
 end;
 
+{$IFDEF VER1_0}
+type
+  TMyComponent = class(TComponent)
+    function GetValidateRenameAddress: pointer;
+  end;
+
+{ TMyComponent }
+
+function TMyComponent.GetValidateRenameAddress: pointer;
+begin
+  Result := @ValidateRename;
+end;
+{$ENDIF}
+
 function GetTComponentValidateRenameVMTOffset: integer;
 begin
-  Result:=GetVMTVirtualMethodOffset(TComponent,@TComponent.ValidateRename,
+  Result:=GetVMTVirtualMethodOffset(TComponent,
+    {$IFNDEF VER1_0}@TComponent.ValidateRename
+    {$ELSE}@TMyComponent.GetValidateRenameAddress{$ENDIF},
     TComponentWithOverrideValidateRename,
     @TComponentWithOverrideValidateRename.ValidateRename);
 end;
 
 var
-  MyFindGlobalComponentProc:function(const AName:AnsiString):TComponent of object;
+  MyFindGlobalComponentProc:function(const AName: AnsiString): TComponent of object;
 
-function MyFindGlobalComponent(const AName:AnsiString):TComponent;
+function MyFindGlobalComponent(const AName: AnsiString): TComponent;
 begin
   Result:=MyFindGlobalComponentProc(AName);
 end;
@@ -941,8 +957,8 @@ begin
 
   // set vmtTypeInfo
   TypeDataSize:=SizeOf(TTypeData)+2; // TTypeData + one word for new prop count
-  TypeInfoSize:=SizeOf(TTypeInfo.Kind)+1+length(NewClassName)+TypeDataSize;
-  if SizeOf(TTypeInfo.Kind)<>1 then
+  TypeInfoSize:=SizeOf(TTypeKind)+1+length(NewClassName)+TypeDataSize;
+  if SizeOf(TTypeKind)<>1 then
     raise Exception.Create('CreateNewClass SizeOf(TTypeInfo^.Kind)<>1');
   GetMem(NewTypeInfo,TypeInfoSize);
   FillChar(NewTypeInfo^,TypeInfoSize,0);