From c1b0432ee5cf24483430006eb8393e3b68c48e0a Mon Sep 17 00:00:00 2001
From: Martin <Martin>
Date: Tue, 17 Sep 2019 19:36:13 +0200
Subject: [PATCH] Add none-native calling for class methods/properties.
 TPSRuntimeClass.RegisterMethodName and
 TPSRuntimeClass.RegisterPropertyNameHelper

---
 Source/uPSRuntime.pas | 81 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/Source/uPSRuntime.pas b/Source/uPSRuntime.pas
index 734dfc71..5971e954 100644
--- a/Source/uPSRuntime.pas
+++ b/Source/uPSRuntime.pas
@@ -511,6 +511,8 @@   TClassItem = record
     5: (PointerInList2: Pointer);
     6: (); {Property helper, like 3}
     7: (); {Property helper that will pass it's name}
+    8: (ProcPtr: TPSProcPtr; Ext1, Ext2: Pointer);
+    9: (ReadProcPtr, WriteProcPtr: TPSProcPtr; ExtRead1, ExtRead2, ExtWrite1, ExtWrite2: Pointer); {Property Helper}
   end;
 
 
@@ -1009,6 +1011,8 @@   TPSRuntimeClass = class
 
     procedure RegisterMethod(ProcPtr: Pointer; const Name: tbtstring);
 
+    procedure RegisterMethodName(const Name: tbtstring; ProcPtr: TPSProcPtr; Ext1, Ext2: Pointer);
+
     procedure RegisterVirtualMethod(ProcPtr: Pointer; const Name: tbtstring);
 
     procedure RegisterVirtualAbstractMethod(ClassDef: TClass; ProcPtr: Pointer; const Name: tbtstring);
@@ -1017,6 +1021,12 @@   TPSRuntimeClass = class
 
     procedure RegisterPropertyHelperName(ReadFunc, WriteFunc: Pointer; const Name: tbtstring);
 
+    procedure RegisterPropertyNameHelper(const Name: tbtstring; ProcPtr: TPSProcPtr;
+    ExtRead1, ExtRead2, ExtWrite1, ExtWrite2: Pointer); overload;
+
+    procedure RegisterPropertyNameHelper(const Name: tbtstring; ProcReadPtr, ProcWritePtr: TPSProcPtr;
+    ExtRead1, ExtRead2, ExtWrite1, ExtWrite2: Pointer); overload;
+
     procedure RegisterEventPropertyHelper(ReadFunc, WriteFunc: Pointer; const Name: tbtstring);
 
     constructor Create(aClass: TClass; const AName: tbtstring);
@@ -11118,6 +11128,26 @@ function SpecImport(Sender: TPSExec; p: TPSExternalProcRec; Tag: Pointer): Boole
               if p.Ext2 = nil then begin result := false; exit; end;
             end;
           end;
+        8:
+          begin
+            p.ProcPtr := px^.ProcPtr;
+            p.Ext1 := px^.Ext1;
+            p.Ext2 := px^.Ext2;
+          end;
+        9:
+          begin
+            if IsRead then
+            begin
+              p.ProcPtr := px^.ReadProcPtr;
+              p.Ext1 := px^.ExtRead1;
+              p.Ext2 := px^.ExtRead2;
+            end else
+            begin
+              p.ProcPtr := px^.WriteProcPtr;
+              p.Ext1 := px^.ExtWrite1;
+              p.Ext2 := px^.ExtWrite2;
+            end;
+          end;
         else
          begin
            result := false;
@@ -11413,6 +11443,20 @@ procedure TPSRuntimeClass.RegisterMethod(ProcPtr: Pointer; const Name: tbtString
   FClassItems.Add(p);
 end;
 
+procedure TPSRuntimeClass.RegisterMethodName(const Name: tbtstring;
+  ProcPtr: TPSProcPtr; Ext1, Ext2: Pointer);
+var
+  P: PClassItem;
+begin
+  New(P);
+  p^.FName := FastUppercase(Name);
+  p^.FNameHash := MakeHash(p^.FName);
+  p^.b := 8;
+  p^.ProcPtr := ProcPtr;
+  p^.Ext1 := Ext1;
+  p^.Ext2 := Ext2;
+  FClassItems.Add(p);
+end;
 
 procedure TPSRuntimeClass.RegisterPropertyHelper(ReadFunc,
   WriteFunc: Pointer; const Name: tbtString);
@@ -11482,6 +11526,43 @@ procedure TPSRuntimeClass.RegisterPropertyHelperName(ReadFunc,
   FClassItems.Add(p);
 end;
 
+procedure TPSRuntimeClass.RegisterPropertyNameHelper(const Name: tbtstring;
+  ProcPtr: TPSProcPtr; ExtRead1, ExtRead2, ExtWrite1, ExtWrite2: Pointer);
+var
+  P: PClassItem;
+begin
+  New(P);
+  p^.FName := FastUppercase(Name);
+  p^.FNameHash := MakeHash(p^.FName);
+  p^.b := 9;
+  p^.ReadProcPtr := ProcPtr;
+  p^.WriteProcPtr := ProcPtr;
+  p^.ExtRead1 := ExtRead1;
+  p^.ExtRead2 := ExtRead2;
+  p^.ExtWrite1 := ExtWrite1;
+  p^.ExtWrite2 := ExtWrite2;
+  FClassItems.Add(p);
+end;
+
+procedure TPSRuntimeClass.RegisterPropertyNameHelper(const Name: tbtstring;
+  ProcReadPtr, ProcWritePtr: TPSProcPtr; ExtRead1, ExtRead2, ExtWrite1,
+  ExtWrite2: Pointer);
+var
+  P: PClassItem;
+begin
+  New(P);
+  p^.FName := FastUppercase(Name);
+  p^.FNameHash := MakeHash(p^.FName);
+  p^.b := 9;
+  p^.ReadProcPtr := ProcReadPtr;
+  p^.WriteProcPtr := ProcWritePtr;
+  p^.ExtRead1 := ExtRead1;
+  p^.ExtRead2 := ExtRead2;
+  p^.ExtWrite1 := ExtWrite1;
+  p^.ExtWrite2 := ExtWrite2;
+  FClassItems.Add(p);
+end;
+
 { TPSRuntimeClassImporter }
 
 function TPSRuntimeClassImporter.Add(aClass: TClass): TPSRuntimeClass;