1)InvokeCall added, instead of all different … #207
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| function TPSExec.InnerfuseCall(_Self, Address: Pointer; CallingConv: TPSCallingConvention; Params: TPSList; res: PPSVariantIFC): Boolean; | ||
| var SysCalConv : TCallConv; | ||
| Args: TArray<TValue>; | ||
| Arg : TValue; | ||
| i : Integer; | ||
| fvar: PPSVariantIFC; | ||
| IsConstr : Boolean; | ||
| ctx: TRTTIContext; | ||
| RttiType : TRttiType; | ||
| ResValue : TValue; | ||
| begin | ||
| Result := False; | ||
| case CallingConv of | ||
| cdRegister : SysCalConv := ccReg; | ||
| cdPascal : SysCalConv := ccPascal; | ||
| cdCdecl : SysCalConv := ccCdecl; | ||
| cdStdCall : SysCalConv := ccStdCall; | ||
| cdSafeCall : SysCalConv := ccSafeCall; | ||
| else | ||
| SysCalConv := ccReg;//to prevent warning "W1036 Variable might not have been initialized" | ||
| end; | ||
|
|
||
| if Assigned(_Self) then | ||
| Args := Args + [TValue.From<Pointer>( _Self )]; | ||
|
|
||
| for I := 0 to Params.Count - 1 do | ||
| begin | ||
| if Params[i] = nil | ||
| then Exit; | ||
| fvar := Params[i]; | ||
|
|
||
| if fvar.varparam then | ||
| begin { var param } | ||
| case fvar.aType.BaseType of | ||
| btArray, btVariant, btSet, btStaticArray, btRecord, btInterface, btClass, {$IFNDEF PS_NOWIDESTRING} btWideString, btWideChar, {$ENDIF} | ||
| btU8, btS8, btU16, btS16, btU32, btS32, btSingle, btDouble, btExtended, btString, btPChar, btChar, btCurrency, | ||
| btUnicodeString | ||
| {$IFNDEF PS_NOINT64}, bts64{$ENDIF}: | ||
| Arg := TValue.From<Pointer>( Pointer(fvar.dta) ); | ||
| else | ||
| begin | ||
| Exit; | ||
| end; | ||
| end; | ||
| end | ||
| else | ||
| begin { not a var param } | ||
| case fvar.aType.BaseType of | ||
| { add normal params here } | ||
| {$IFNDEF PS_NOWIDESTRING} | ||
| btWidestring, | ||
| btUnicodestring, | ||
| {$ENDIF} | ||
| btString: Arg := TValue.From(pstring(fvar.dta)^); | ||
| btU8, btS8: Arg := TValue.From(pbyte(fvar.dta)^); | ||
| btU16, BtS16: Arg := TValue.From(pword(fvar.dta)^); | ||
| btU32, btS32: Arg := TValue.From(pCardinal(fvar.dta)^); | ||
| {$IFNDEF PS_NOINT64}bts64:{$ENDIF} Arg := TValue.From(pint64(fvar.dta)^); | ||
| btSingle: Arg := TValue.From(PSingle(fvar.dta)^); | ||
| btDouble, btExtended: Arg := TValue.From(PDouble(fvar.dta)^); | ||
| btPChar: Arg := TValue.From(ppchar(fvar.dta)^); | ||
| btChar: Arg := TValue.From(pchar(fvar.dta)^); | ||
| btClass: Arg := TValue.From(TObject(fvar.dta^)); | ||
| btRecord: Arg := TValue.From<Pointer>(fvar.dta); | ||
| btStaticArray: Arg := TValue.From<Pointer>(fvar.dta); | ||
| btArray: | ||
| begin | ||
| if Copy(fvar.aType.ExportName, 1, 10) = '!OPENARRAY' then | ||
| begin //openarray | ||
| //in case of openarray we should provide TWO params: first is pointer to array, | ||
| Args := Args + [TValue.From<Pointer>(Pointer(fvar.Dta^))]; | ||
| //2nd - integer with arraylength - 1 (high) | ||
| Arg := TValue.From<Integer>(PSDynArrayGetLength(Pointer(fvar.Dta^), fvar.aType)-1);// = High of OpenArray | ||
| end | ||
| else //dynarray = just push pointer | ||
| Arg := TValue.From<Pointer>(fvar.dta); | ||
| end; | ||
| btSet: | ||
| begin | ||
| case TPSTypeRec_Set(fvar.aType).aByteSize of | ||
| 1: Arg := TValue.From(pbyte(fvar.dta)^); | ||
| 2: Arg := TValue.From(pWord(fvar.dta)^); | ||
| 3, | ||
| 4: Arg := TValue.From(pCardinal(fvar.dta)^); | ||
| else | ||
| Arg := TValue.From<Pointer>(fvar.dta); | ||
| end; | ||
| end; | ||
| else | ||
| // writeln(stderr, 'Parameter type not implemented!'); | ||
| Exit; | ||
| end; { case } | ||
| end; | ||
| Args := Args + [Arg]; | ||
| end; | ||
|
|
||
| IsConstr := (Integer(CallingConv) and 64) <> 0; | ||
| if not assigned(res) then | ||
| begin | ||
| Invoke(Address,Args,SysCalConv,nil,False,IsConstr); { ignore return } | ||
| end | ||
| else begin | ||
| case res.atype.basetype of | ||
| { add result types here } | ||
| btString: tbtstring(res.dta^) := tbtstring(Invoke(Address,Args,SysCalConv,TypeInfo(String),False,IsConstr).AsString) | ||
| ; | ||
| {$IFNDEF PS_NOWIDESTRING} | ||
| btUnicodeString: tbtunicodestring(res.dta^) := Invoke(Address,Args,SysCalConv,TypeInfo(String),False,IsConstr).AsString; | ||
| btWideString: tbtWideString(res.dta^) := Invoke(Address,Args,SysCalConv,TypeInfo(String),False,IsConstr).AsString; | ||
| {$ENDIF} | ||
| btU8, btS8: pbyte(res.dta)^ := Byte(Invoke(Address,Args,SysCalConv,TypeInfo(Byte),False,IsConstr).AsInteger); | ||
| btU16, btS16: pword(res.dta)^ := word(Invoke(Address,Args,SysCalConv,TypeInfo(Word),False,IsConstr).AsInteger); | ||
| btU32, btS32: pCardinal(res.dta)^ := Cardinal(Invoke(Address,Args,SysCalConv,TypeInfo(Cardinal),False,IsConstr).AsInteger); | ||
| {$IFNDEF PS_NOINT64}bts64:{$ENDIF} pInt64(res.dta)^ := Int64(Invoke(Address,Args,SysCalConv,TypeInfo(Int64),False,IsConstr).AsInt64); | ||
| btSingle: psingle(res.dta)^ := Double(Invoke(Address,Args,SysCalConv,TypeInfo(Single),False,IsConstr).AsExtended); | ||
| btDouble, btExtended: pdouble(res.dta)^ := Double(Invoke(Address,Args,SysCalConv,TypeInfo(Double),False,IsConstr).AsExtended); | ||
| btPChar: ppchar(res.dta)^ := pchar(Invoke(Address,Args,SysCalConv,TypeInfo(PChar),False,IsConstr).AsType<PChar>()); | ||
| btChar: pchar(res.dta)^ := Char(Invoke(Address,Args,SysCalConv,TypeInfo(Char),False,IsConstr).AsType<Char>()); | ||
| btSet: | ||
| begin | ||
| case TPSTypeRec_Set(res.aType).aByteSize of | ||
| 1: byte(res.Dta^) := Byte(Invoke(Address,Args,SysCalConv,TypeInfo(Byte),False,IsConstr).AsInteger); | ||
| 2: word(res.Dta^) := word(Invoke(Address,Args,SysCalConv,TypeInfo(Word),False,IsConstr).AsInteger); | ||
| 3, | ||
| 4: Longint(res.Dta^) := Cardinal(Invoke(Address,Args,SysCalConv,TypeInfo(Cardinal),False,IsConstr).AsInteger); | ||
| else | ||
| begin | ||
| for RttiType in ctx.GetTypes do | ||
| if (RttiType.Name.ToUpper.EndsWith(String(res.aType.FExportName))) and (RttiType.TypeKind = tkSet) | ||
| and (RttiType.TypeSize = TPSTypeRec_Set(res.aType).aByteSize) then | ||
| begin | ||
| Invoke(Address,Args,SysCalConv,RttiType.Handle,False,IsConstr).ExtractRawData(res.dta); | ||
| Break; | ||
| end; | ||
| end; | ||
| end; | ||
| end; | ||
| btClass: | ||
| begin | ||
| for RttiType in ctx.GetTypes do | ||
| if (RttiType.Name.ToUpper.EndsWith(String(res.aType.FExportName))) and (RttiType.TypeKind = tkClass) then | ||
| begin | ||
| TObject(res.dta^) := Invoke(Address,Args,SysCalConv,RttiType.Handle,False,IsConstr).AsObject; | ||
| Break; | ||
| end; | ||
| end; | ||
| btStaticArray: | ||
| begin | ||
| for RttiType in ctx.GetTypes do | ||
| if (RttiType.Name.ToUpper.EndsWith(String(res.aType.FExportName))) and (RttiType.TypeKind = tkArray) then | ||
| begin | ||
| CopyArrayContents(res.dta, Invoke(Address,Args,SysCalConv,RttiType.Handle,False,IsConstr).GetReferenceToRawData, TPSTypeRec_StaticArray(res.aType).Size, TPSTypeRec_StaticArray(res.aType).ArrayType); | ||
| Break; | ||
| end; | ||
| end; | ||
| btRecord: | ||
| begin | ||
| for RttiType in ctx.GetTypes do | ||
| if (RttiType.Name.ToUpper.EndsWith(String(res.aType.FExportName))) and (RttiType.TypeKind = tkRecord) then | ||
| begin | ||
| CopyArrayContents(res.dta, (Invoke(Address,Args,SysCalConv,RttiType.Handle,False,IsConstr).GetReferenceToRawData), 1, res.aType); | ||
| Break; | ||
| end; | ||
| end; | ||
| btArray: //need to check with open arrays | ||
| begin | ||
| for RttiType in ctx.GetTypes do | ||
| if (RttiType.Name.ToUpper.EndsWith(String(res.aType.FExportName))) and (RttiType.TypeKind = tkDynArray) then | ||
| begin | ||
| ResValue := Invoke(Address,Args,SysCalConv,RttiType.Handle,False,IsConstr); | ||
| if ResValue.GetArrayLength > 0 then | ||
| CopyArrayContents(res.dta, ResValue.GetReferenceToRawData, 1, res.aType) | ||
| else | ||
| res.dta := nil; | ||
| Break; | ||
| end; | ||
| end; | ||
| else | ||
| // writeln(stderr, 'Result type not implemented!'); | ||
| Exit; | ||
| end; { case } | ||
| end; //assigned(res) | ||
|
|
||
| Result := True; | ||
| end; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1734,3 +1734,4 @@ procedure TPSUnit.SetUnitName(const Value: TbtString); | |
| end. | ||
|
|
||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is still here? AFAIK this doesn't compile in d2..d7.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
compiled in D7 normally.
About previous version have no idea - they cant be installed on Win7 x64.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Screen for you from D7 :)