wasi: job: callbacks

demo/wasienv/dom/WasiDomTest1.lpr

@@ -31,14 +31,14 @@ type
 
   TWasmApp = class
   private
-    function OnPlaygroundClick(Event: IEventListenerEvent): boolean;
+    function OnPlaygroundClick(Event: IJSEventListenerEvent): boolean;
   public
     procedure Run;
   end;
 
 { TApplication }
 
-function TWasmApp.OnPlaygroundClick(Event: IEventListenerEvent): boolean;
+function TWasmApp.OnPlaygroundClick(Event: IJSEventListenerEvent): boolean;
 begin
   writeln('TWasmApp.OnPlaygroundClick ');
   Result:=true;
@@ -132,10 +132,10 @@ begin
   Result:=InvokeJSLongIntResult('GetInteger',[]);
 end;
 
-function JOBCallback(Func, Data, Code, Args: NativeInt): word;
+// workaround: fpc wasm does not yet support exporting functions from units
+function JOBCallback(const Func: TJOBCallback; Data, Code: Pointer; Args: PByte): PByte;
 begin
-  writeln('MyCallBack2 Func=',Func,' Data=',Data,' Code=',Code,' Args=',Args);
-  Result:=Func+123;
+  Result:=JOB_WAsm.JOBCallback(Func,Data,Code,Args);
 end;
 
 exports

demo/wasienv/dom/job_browser.pp

@@ -14,7 +14,7 @@ uses sysutils, types, js, web, wasienv, JOB_Shared;
 Type
   EJOBBridge = class(Exception);
   TWasmNativeInt = Longword;
-  TJOBCallback = function(aCall, aData, aCode, Args: TWasmNativeInt): jsvalue;
+  TJOBCallback = function(aCall, aData, aCode, Args: TWasmNativeInt): TWasmNativeInt;
 
   { TJSObjectBridge }
 
@@ -31,6 +31,7 @@ Type
     function Invoke_JSResult(ObjId: TJOBObjectID; NameP, NameLen, Invoke, ArgsP: NativeInt; out JSResult: JSValue): TJOBResult; virtual;
     function GetInvokeArguments(View: TJSDataView; ArgsP: NativeInt): TJSValueDynArray; virtual;
     function CreateCallbackArgs(View: TJSDataView; const Args: TJSFunctionArguments): TWasmNativeInt; virtual;
+    function EatCallbackResult(View: TJSDataView; ResultP: TWasmNativeInt): jsvalue; virtual;
     // exports
     function Invoke_NoResult(ObjId: TJOBObjectID; NameP, NameLen, Invoke, ArgsP: NativeInt): TJOBResult; virtual;
     function Invoke_BooleanResult(ObjId: TJOBObjectID; NameP, NameLen, Invoke, ArgsP, ResultP: NativeInt): TJOBResult; virtual;
@@ -392,7 +393,7 @@ end;
 
 function TJSObjectBridge.ReleaseObject(ObjId: TJOBObjectID): TJOBResult;
 begin
-  //writeln('TJOBBridge.ReleaseObject ',ObjId);
+  writeln('TJOBBridge.ReleaseObject ',ObjId);
   if ObjId<0 then
     raise EJOBBridge.Create('cannot release a global object');
   if ObjId>=FLocalObjects.Length then
@@ -444,12 +445,17 @@ var
     aCall:=ReadWasmNativeInt;
     aData:=ReadWasmNativeInt;
     aCode:=ReadWasmNativeInt;
+
     Result:=function: jsvalue
-      var Args: TWasmNativeInt;
+      var
+        Args, ResultP: TWasmNativeInt;
       begin
-        writeln('TJSObjectBridge called Method Call=',aCall,' Data=',aData,' Code=',aCode,' Args=',JSArguments.length);
+        //writeln('TJSObjectBridge called JS Method Call=',aCall,' Data=',aData,' Code=',aCode,' Args=',JSArguments.length);
         Args:=CreateCallbackArgs(View,JSArguments);
-        Result:=CallbackHandler(aCall,aData,aCode,Args);
+        ResultP:=CallbackHandler(aCall,aData,aCode,Args); // this frees Args
+        //writeln('TJSObjectBridge called Wasm Call=',aCall,' Data=',aData,' Code=',aCode,' ResultP=',ResultP);
+        Result:=EatCallbackResult(View,ResultP); // this frees ResultP
+        //writeln('TJSObjectBridge Result=',Result);
       end;
   end;
 
@@ -550,7 +556,7 @@ begin
     r:=GetJOBResult(Arg);
     inc(Len);
     case r of
-    JOBResult_Boolean: inc(Len);
+    JOBResult_Boolean: ;
     JOBResult_Double: inc(Len,8);
     JOBResult_String: inc(Len,4+2*TJSString(Arg).length);
     JOBResult_Function,
@@ -569,24 +575,32 @@ begin
   begin
     Arg:=Args[i];
     r:=GetJOBResult(Arg);
-    View.setUint8(p,r);
-    inc(p);
+    //writeln('TJSObjectBridge.CreateCallbackArgs ',i,'/',Args.Length,' r=',r);
     case r of
+    JOBResult_Null:
+      begin
+        View.setUint8(p,JOBArgNil);
+        inc(p);
+      end;
     JOBResult_Boolean:
       begin
       if Arg then
-        View.setUint8(p,1)
+        View.setUint8(p,JOBArgTrue)
       else
-        View.setUint8(p,0);
+        View.setUint8(p,JOBArgFalse);
       inc(p);
       end;
     JOBResult_Double:
       begin
+        View.setUint8(p,JOBArgDouble);
+        inc(p);
         View.setFloat64(p,double(Arg),env.IsLittleEndian);
         inc(p,8);
       end;
     JOBResult_String:
       begin
+        View.setUint8(p,JOBArgUnicodeString);
+        inc(p);
         s:=String(Arg);
         View.setUint32(p,length(s));
         inc(p,4);
@@ -599,11 +613,59 @@ begin
     JOBResult_Function,
     JOBResult_Object:
       begin
+        View.setUint8(p,JOBArgObject);
+        inc(p);
         NewId:=RegisterLocalObject(TJSObject(Arg));
         View.setUint32(p, longword(NewId), env.IsLittleEndian);
         inc(p,4);
       end;
+    else
+      View.setUint8(p,JOBArgUndefined);
+      inc(p);
+    end;
+  end;
+end;
+
+function TJSObjectBridge.EatCallbackResult(View: TJSDataView;
+  ResultP: TWasmNativeInt): jsvalue;
+var
+  p: TWasmNativeInt;
+  aType: Byte;
+  ObjId: LongInt;
+  Len: LongWord;
+  aWords: TJSUint16Array;
+begin
+  if ResultP=0 then
+    exit(Undefined);
+  p:=ResultP;
+  try
+    aType:=View.getUint8(p);
+    //writeln('TJSObjectBridge.EatCallbackResult aType=',aType);
+    inc(p);
+    case aType of
+    JOBArgTrue: Result:=true;
+    JOBArgFalse: Result:=false;
+    JOBArgLongint: Result:=View.getInt32(p,env.IsLittleEndian);
+    JOBArgDouble: Result:=View.getFloat64(p,env.IsLittleEndian);
+    JOBArgUnicodeString:
+      begin
+        Len:=View.getUInt32(p,env.IsLittleEndian);
+        inc(p);
+        aWords:=TJSUint16Array.New(View.buffer, p,Len);
+        Result:=TypedArrayToString(aWords);
+      end;
+    JOBArgNil: Result:=nil;
+    JOBArgObject:
+      begin
+        ObjId:=View.getInt32(p,env.IsLittleEndian);
+        Result:=FindObject(ObjId);
+      end;
+    else
+      Result:=Undefined;
     end;
+  finally
+    //writeln('TJSObjectBridge.EatCallbackResult freeing result...');
+    WasiExports.freeMem(ResultP);
   end;
 end;
 

demo/wasienv/dom/job_wasm.pas

@@ -8,6 +8,7 @@
 unit JOB_WAsm;
 
 {$mode ObjFPC}{$H+}
+{$ModeSwitch advancedrecords}
 
 {$define VerboseJOB}
 
@@ -29,6 +30,7 @@ Type
     ObjectID: TJOBObjectID;
     FuncName: string;
   end;
+  EJSArgParse = class(EJSObject);
 
   TJOB_JSValueKind = (
     jjvkUndefined,
@@ -101,7 +103,7 @@ type
     function AsString: string; override;
   end;
 
-  TJOBCallback = function(const aMethod: TMethod; Args: NativeInt): TJOB_JSValue;
+  TJOBCallback = function(const aMethod: TMethod; Args: PByte): PByte;
 
   { TJOB_JSValueMethod }
 
@@ -131,7 +133,7 @@ type
   IJSObject = interface
     ['{BE5CDE03-D471-4AB3-8F27-A5EA637416F7}']
     function GetJSObjectID: TJOBObjectID;
-    function GetJSObjectCasted: IJSObject;
+    function GetJSObjectCastSrc: IJSObject;
     function GetPascalClassName: string;
     procedure InvokeJSNoResult(const aName: string; Const Args: Array of const; Invoke: TJOBInvokeSetType = jisCall); virtual;
     function InvokeJSBooleanResult(const aName: string; Const Args: Array of const; Invoke: TJOBInvokeGetType = jigCall): Boolean; virtual;
@@ -162,7 +164,7 @@ type
   TJSObject = class(TInterfacedObject,IJSObject)
   private
     FObjectID: TJOBObjectID;
-    FCasted: IJSObject;
+    FCastSrc: IJSObject;
   protected
     type
       TJOBInvokeOneResultFunc = function(
@@ -174,7 +176,7 @@ type
           ResultP: PByte
         ): TJOBResult;
     function GetJSObjectID: TJOBObjectID;
-    function GetJSObjectCasted: IJSObject;
+    function GetJSObjectCastSrc: IJSObject;
     function GetPascalClassName: string;
     function FetchString(Len: NativeInt): UnicodeString;
     function InvokeJSOneResult(const aName: string; Const Args: Array of const;
@@ -185,9 +187,10 @@ type
     function CreateInvokeJSArgs(const Args: array of const): PByte; virtual;
   public
     constructor Cast(Intf: IJSObject);
-    constructor CreateFromID(aID: TJOBObjectID); virtual;
+    constructor CreateFromID(aID: TJOBObjectID); virtual; // use this only for the owner (it will release it on free)
     destructor Destroy; override;
     property ObjectID: TJOBObjectID read FObjectID;
+    property CastSrc: IJSObject read FCastSrc; // nil means it is the owner, otherwise it is a typecast
     // call a function
     procedure InvokeJSNoResult(const aName: string; Const Args: Array of const; Invoke: TJOBInvokeSetType = jisCall); virtual;
     function InvokeJSBooleanResult(const aName: string; Const Args: Array of const; Invoke: TJOBInvokeGetType = jigCall): Boolean; virtual;
@@ -217,6 +220,32 @@ type
     function NewJSObject(Const Args: Array of const; aResultClass: TJSObjectClass): TJSObject; virtual;
   end;
 
+  { TJOBCallbackHelper - parse callback arguments and create result }
+
+  TJOBCallbackHelper = record
+    p: PByte;
+    Index: integer;
+    Count: integer;
+    procedure Init(Args: PByte);
+    function GetType: byte; // see JOBArg* constants, keeps p
+    procedure Skip;
+    function GetBoolean: boolean;
+    function GetDouble: double;
+    function GetString: UnicodeString;
+    function GetObject(aResultClass: TJSObjectClass): TJSObject;
+    function GetValue: TJOB_JSValue;
+
+    function AllocUndefined: PByte;
+    function AllocBool(b: boolean): PByte;
+    function AllocLongint(i: longint): PByte;
+    function AllocDouble(const d: double): PByte;
+    function AllocString(const s: UnicodeString): PByte;
+    function AllocNil: PByte;
+    function AllocIntf(Intf: IJSObject): PByte;
+    function AllocObject(Obj: TJSObject): PByte;
+    function AllocObjId(ObjId: TJOBObjectID): PByte;
+  end;
+
 var
   JSObject: TJSObject;
 
@@ -285,7 +314,7 @@ function __job_invoke_jsvalueresult(
   ResultP: PByte  // various
 ): TJOBResult; external JOBExportName name JOBFn_InvokeJSValueResult;
 
-function MyCallBack(ObjID: TJOBObjectID): boolean;
+function JOBCallback(const Func: TJOBCallback; Data, Code: Pointer; Args: PByte): PByte;
 
 implementation
 
@@ -329,6 +358,7 @@ begin
     Result:='vt?';
   end;
 end;
+{$ENDIF}
 
 function __job_callback(w: NativeInt): boolean;
 begin
@@ -336,10 +366,288 @@ begin
   Result:=true;
 end;
 
-// exported function
-function MyCallBack(ObjID: TJOBObjectID): boolean; //public; alias: JOBFn_CallbackHandler;
+function JOBCallback(const Func: TJOBCallback; Data, Code: Pointer; Args: PByte
+  ): PByte;
+var
+  m: TMethod;
+begin
+  Result:=nil;
+  try
+    //writeln('JOBCallback');
+    m.Data:=Data;
+    m.Code:=Code;
+    Result:=Func(m,Args);
+  finally
+    if Args<>nil then
+      FreeMem(Args);
+  end;
+end;
+
+{ TJOBCallbackHelper }
+
+procedure TJOBCallbackHelper.Init(Args: PByte);
+begin
+  p:=Args;
+  Index:=0;
+  if p<>nil then
+  begin
+    Count:=p^;
+    inc(p);
+  end else
+    Count:=0;
+end;
+
+function TJOBCallbackHelper.GetType: byte;
+begin
+  if Index=Count then
+    Result:=JOBArgUndefined
+  else
+    Result:=p^;
+end;
+
+procedure TJOBCallbackHelper.Skip;
+var
+  Len: LongWord;
+begin
+  if Index=Count then exit;
+  case p^ of
+  JOBArgUndefined,
+  JOBArgTrue,
+  JOBArgFalse,
+  JOBArgNil: inc(p);
+  JOBArgDouble: inc(p,9);
+  JOBArgUnicodeString:
+    begin
+      inc(p);
+      Len:=PLongWord(p)^;
+      inc(p,4+2*Len);
+    end
+  else
+    raise EJSArgParse.Create(JOBArgNames[p^]);
+  end;
+  inc(Index);
+end;
+
+function TJOBCallbackHelper.GetBoolean: boolean;
+begin
+  Result:=false;
+  if Index=Count then
+    exit;
+  case p^ of
+  JOBArgUndefined: ;
+  JOBArgTrue: Result:=true;
+  JOBArgFalse: ;
+  else
+    raise EJSArgParse.Create(JOBArgNames[p^]);
+  end;
+  inc(p);
+  inc(Index);
+end;
+
+function TJOBCallbackHelper.GetDouble: double;
+begin
+  Result:=NaN;
+  if Index=Count then
+    exit;
+  case p^ of
+  JOBArgUndefined:
+    inc(p);
+  JOBArgDouble:
+    begin
+      inc(p);
+      Result:=PDouble(p)^;
+      inc(p,8);
+    end
+  else
+    raise EJSArgParse.Create(JOBArgNames[p^]);
+  end;
+  inc(Index);
+end;
+
+function TJOBCallbackHelper.GetString: UnicodeString;
+var
+  Len: LongWord;
+begin
+  Result:='';
+  if Index=Count then
+    exit;
+  case p^ of
+  JOBArgUndefined:
+    inc(p);
+  JOBArgUnicodeString:
+    begin
+      inc(p);
+      Len:=PLongWord(p)^;
+      inc(p,4);
+      if Len>0 then
+      begin
+        SetLength(Result,Len);
+        Move(p^,Result[1],2*Len);
+        inc(p,2*Len);
+      end;
+    end
+  else
+    raise EJSArgParse.Create(JOBArgNames[p^]);
+  end;
+  inc(Index);
+end;
+
+function TJOBCallbackHelper.GetObject(aResultClass: TJSObjectClass): TJSObject;
+var
+  ObjId: LongWord;
+begin
+  //writeln('TJOBCallbackHelper.GetObject ',Index,' Count=',Count);
+  Result:=nil;
+  if Index=Count then
+    exit;
+  //writeln('TJOBCallbackHelper.GetObject type=',p^);
+  case p^ of
+  JOBArgUndefined,
+  JOBArgNil:
+    inc(p);
+  JOBArgObject:
+    begin
+      inc(p);
+      ObjId:=PLongWord(p)^;
+      inc(p,4);
+      Result:=aResultClass.CreateFromID(ObjId);
+    end
+  else
+    raise EJSArgParse.Create(JOBArgNames[p^]);
+  end;
+  inc(Index);
+end;
+
+function TJOBCallbackHelper.GetValue: TJOB_JSValue;
+var
+  ObjId, Len: LongWord;
+  Obj: TJSObject;
+  S: UnicodeString;
+begin
+  Result:=nil;
+  if (Index=Count) or (p^=JOBArgUndefined) then
+  begin
+    Result:=TJOB_JSValue.Create(jjvkUndefined);
+    exit;
+  end;
+  case p^ of
+  JOBArgTrue:
+    begin
+      Result:=TJOB_JSValueBoolean.Create(true);
+      inc(p);
+    end;
+  JOBArgFalse:
+    begin
+      Result:=TJOB_JSValueBoolean.Create(false);
+      inc(p);
+    end;
+  JOBArgDouble:
+    begin
+      inc(p);
+      Result:=TJOB_JSValueDouble.Create(PDouble(p)^);
+      inc(p,8);
+    end;
+  JOBArgUnicodeString:
+    begin
+      inc(p);
+      Len:=PLongWord(p)^;
+      inc(p,4);
+      S:='';
+      if Len>0 then
+      begin
+        SetLength(S,Len);
+        Move(p^,S[1],2*Len);
+        inc(p,2*Len);
+      end;
+      Result:=TJOB_JSValueString.Create(S);
+    end;
+  JOBArgNil:
+    begin
+      Result:=TJOB_JSValueObject.Create(nil);
+      inc(p);
+    end;
+  JOBArgObject:
+    begin
+      inc(p);
+      ObjId:=PLongWord(p)^;
+      inc(p,4);
+      Obj:=TJSObject.CreateFromID(ObjId);
+      Result:=TJOB_JSValueObject.Create(Obj);
+    end;
+  else
+    raise EJSArgParse.Create(JOBArgNames[p^]);
+  end;
+  inc(Index);
+end;
+
+function TJOBCallbackHelper.AllocUndefined: PByte;
+begin
+  GetMem(Result,1);
+  Result^:=JOBArgUndefined;
+end;
+
+function TJOBCallbackHelper.AllocBool(b: boolean): PByte;
+begin
+  GetMem(Result,1);
+  if b then
+    Result^:=JOBArgTrue
+  else
+    Result^:=JOBArgFalse;
+end;
+
+function TJOBCallbackHelper.AllocLongint(i: longint): PByte;
+begin
+  GetMem(Result,5);
+  Result^:=JOBArgLongint;
+  PLongint(Result+1)^:=i;
+end;
+
+function TJOBCallbackHelper.AllocDouble(const d: double): PByte;
+begin
+  GetMem(Result,9);
+  Result^:=JOBArgDouble;
+  PDouble(Result+1)^:=d;
+end;
+
+function TJOBCallbackHelper.AllocString(const s: UnicodeString): PByte;
+var
+  l: SizeInt;
+begin
+  l:=length(s);
+  GetMem(Result,5+l);
+  Result^:=JOBArgUnicodeString;
+  PLongWord(Result+1)^:=l;
+  if l>0 then
+    Move(s[1],Result[5],l);
+end;
+
+function TJOBCallbackHelper.AllocNil: PByte;
+begin
+  GetMem(Result,1);
+  Result^:=JOBArgNil;
+end;
+
+function TJOBCallbackHelper.AllocIntf(Intf: IJSObject): PByte;
 begin
-  Result:=ObjID>0;
+  if Intf=nil then
+    Result:=AllocNil
+  else
+    Result:=AllocObjId(Intf.GetJSObjectID);
+end;
+
+function TJOBCallbackHelper.AllocObject(Obj: TJSObject): PByte;
+begin
+  if Obj=nil then
+    Result:=AllocNil
+  else
+    Result:=AllocObjId(Obj.ObjectID);
+end;
+
+function TJOBCallbackHelper.AllocObjId(ObjId: TJOBObjectID): PByte;
+begin
+  GetMem(Result,1+SizeOf(TJOBObjectID));
+  Result^:=JOBArgObject;
+  PJOBObjectID(Result+1)^:=ObjId;
 end;
 
 { TJOB_JSValueMethod }
@@ -357,8 +665,6 @@ begin
   Result:='Callback';
 end;
 
-{$ENDIF}
-
 { TJOB_JSValue }
 
 constructor TJOB_JSValue.Create(aKind: TJOB_JSValueKind);
@@ -438,9 +744,9 @@ begin
   Result:=FObjectID;
 end;
 
-function TJSObject.GetJSObjectCasted: IJSObject;
+function TJSObject.GetJSObjectCastSrc: IJSObject;
 begin
-  Result:=FCasted;
+  Result:=FCastSrc;
 end;
 
 function TJSObject.GetPascalClassName: string;
@@ -902,9 +1208,9 @@ end;
 constructor TJSObject.Cast(Intf: IJSObject);
 begin
   FObjectID:=Intf.GetJSObjectID;
-  FCasted:=Intf.GetJSObjectCasted;
-  if FCasted=nil then
-    FCasted:=Intf;
+  FCastSrc:=Intf.GetJSObjectCastSrc;
+  if FCastSrc=nil then
+    FCastSrc:=Intf;
 end;
 
 constructor TJSObject.CreateFromID(aID: TJOBObjectID);
@@ -914,8 +1220,8 @@ end;
 
 destructor TJSObject.Destroy;
 begin
-  if FCasted<>nil then
-    FCasted:=nil
+  if FCastSrc<>nil then
+    FCastSrc:=nil
   else if ObjectID>=0 then
     __job_release_object(ObjectID);
   FObjectID:=0;
@@ -951,7 +1257,10 @@ var
 begin
   b:=false;
   aError:=InvokeJSOneResult(aName,Args,@__job_invoke_boolresult,@b,Invoke);
-  if aError<>JOBResult_Boolean then
+  if aError=JOBResult_Boolean then
+  else if aError=JOBResult_Undefined then
+    b:=false
+  else
     InvokeJS_RaiseResultMismatch(aName,JOBResult_Boolean,aError);
   Result:=b;
 end;
@@ -963,7 +1272,10 @@ var
 begin
   Result:=NaN;
   aError:=InvokeJSOneResult(aName,Args,@__job_invoke_doubleresult,@Result,Invoke);
-  if aError<>JOBResult_Double then
+  if aError=JOBResult_Double then
+  else if aError=JOBResult_Undefined then
+    Result:=NaN
+  else
     InvokeJS_RaiseResultMismatch(aName,JOBResult_Double,aError);
 end;
 
@@ -975,9 +1287,13 @@ var
 begin
   ResultLen:=0;
   aError:=InvokeJSOneResult(aName,Args,@__job_invoke_stringresult,@ResultLen,Invoke);
-  if aError<>JOBResult_String then
-    InvokeJS_RaiseResultMismatch(aName,JOBResult_String,aError);
-  Result:=FetchString(ResultLen);
+  if aError=JOBResult_String then
+    Result:=FetchString(ResultLen)
+  else begin
+    Result:='';
+    if aError<>JOBResult_Undefined then
+      InvokeJS_RaiseResultMismatch(aName,JOBResult_String,aError);
+  end;
   //writeln('TJSObject.InvokeJSUnicodeStringResult Result="',Result,'"');
 end;
 
@@ -991,7 +1307,7 @@ begin
   Result:=nil;
   NewObjId:=-1;
   aError:=InvokeJSOneResult(aName,Args,@__job_invoke_objectresult,@NewObjId,Invoke);
-  if aError=JOBResult_Null then
+  if (aError=JOBResult_Null) or (aError=JOBResult_Undefined) then
     exit;
   if aError<>JOBResult_Object then
     InvokeJS_RaiseResultMismatch(aName,JOBResult_Object,aError);

demo/wasienv/dom/job_web.pas

@@ -10,10 +10,12 @@ uses
 
 type
   IJSEvent = interface;
+  TJSEvent = class;
 
-  IEventListenerEvent = IJSEvent;
+  IJSEventListenerEvent = IJSEvent;
+  TJSEventListenerEvent = TJSEvent;
 
-  TJSEventHandler = function(Event: IEventListenerEvent): boolean of object;
+  TJSEventHandler = function(Event: IJSEventListenerEvent): boolean of object;
 
   IJSEventTarget = interface
     ['{1883145B-C826-47D1-9C63-47546BA536BD}']
@@ -99,19 +101,19 @@ type
   TJSMouseEvent = class(TJSUIEvent,IJSMouseEvent)
   end;
 
-  THTMLClickEventHandler = function(aEvent: IJSMouseEvent) : boolean of object;
+  TJSHTMLClickEventHandler = function(aEvent: IJSMouseEvent) : boolean of object;
 
   { IJSHTMLElement }
 
   IJSHTMLElement = interface(IJSElement)
     ['{D50E53E1-5B3B-4DA4-ACB0-1FD0DE32B711}']
-    procedure set_onclick(const h: THTMLClickEventHandler);
+    procedure set_onclick(const h: TJSHTMLClickEventHandler);
   end;
 
   { TJSHTMLElement }
 
   TJSHTMLElement = class(TJSElement,IJSHTMLElement)
-    procedure set_onclick(const h: THTMLClickEventHandler);
+    procedure set_onclick(const h: TJSHTMLClickEventHandler);
   end;
 
   IJSDocument = interface(IJSNode)
@@ -144,27 +146,32 @@ var
   JSDocument: TJSDocument;
   JSWindow: TJSWindow;
 
-function JOBCallTHTMLClickEventHandler(const aMethod: TMethod; Args: NativeInt): TJOB_JSValue;
-function JOBCallTJSEventHandler(const aMethod: TMethod; Args: NativeInt): TJOB_JSValue;
+function JOBCallTJSHTMLClickEventHandler(const aMethod: TMethod; Args: PByte): PByte;
+function JOBCallTJSEventHandler(const aMethod: TMethod; Args: PByte): PByte;
 
 implementation
 
-function JOBCallTHTMLClickEventHandler(const aMethod: TMethod; Args: NativeInt
-  ): TJOB_JSValue;
+function JOBCallTJSHTMLClickEventHandler(const aMethod: TMethod; Args: PByte
+  ): PByte;
+var
+  p: TJOBCallbackHelper;
+  Event: IJSMouseEvent;
 begin
-  writeln('InvokeTHTMLClickEventHandler ');
-  Result:=nil;
-  if aMethod.Code=nil then ;
-  if Args=0 then ;
+  writeln('JOBCallTHTMLClickEventHandler ');
+  p.Init(Args);
+  Event:=p.GetObject(TJSMouseEvent) as IJSMouseEvent;
+  Result:=p.AllocBool(TJSHTMLClickEventHandler(aMethod)(Event));
 end;
 
-function JOBCallTJSEventHandler(const aMethod: TMethod; Args: NativeInt
-  ): TJOB_JSValue;
+function JOBCallTJSEventHandler(const aMethod: TMethod; Args: PByte
+  ): PByte;
+var
+  p: TJOBCallbackHelper;
+  Event: IJSEventListenerEvent;
 begin
-  writeln('InvokeTJSEventHandler ');
-  Result:=nil;
-  if aMethod.Code=nil then ;
-  if Args=0 then ;
+  p.Init(Args);
+  Event:=p.GetObject(TJSEventListenerEvent) as IJSEventListenerEvent;
+  Result:=p.AllocBool(TJSEventHandler(aMethod)(Event));
 end;
 
 { TJSEventTarget }
@@ -184,11 +191,11 @@ end;
 
 { TJSHTMLElement }
 
-procedure TJSHTMLElement.set_onclick(const h: THTMLClickEventHandler);
+procedure TJSHTMLElement.set_onclick(const h: TJSHTMLClickEventHandler);
 var
   cb1: TJOB_JSValueMethod;
 begin
-  cb1:=TJOB_JSValueMethod.Create(TMethod(h),@JOBCallTHTMLClickEventHandler);
+  cb1:=TJOB_JSValueMethod.Create(TMethod(h),@JOBCallTJSHTMLClickEventHandler);
   try
     WriteJSPropertyValue('onclick',cb1);
   finally