Skip to content

IDispatchInvoke: pass IDispatch arguments as VT_DISPATCH #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TetzkatLipHoka wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −28
Open

IDispatchInvoke: pass IDispatch arguments as VT_DISPATCH #304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 33 additions & 28 deletions Source/uPSRuntime.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13820,12 +13820,14 @@ procedure TPSStack.SetWideString(ItemNo: Longint;
function IDispatchInvoke(Self: IDispatch; PropertySet: Boolean; const Name: tbtString; const Par: array of Variant): Variant;
var
Param: Word;
i, ArgErr: Longint;
i, ArgErr, aSize: Longint;
DispatchId: Longint;
DispParam: TDispParams;
ExceptInfo: TExcepInfo;
aName: PWideChar;
WSFreeList: TPSList;
ArgType: Word;
DispArg: PVariantArg;
begin
if Self = nil then begin
raise EPSException.Create('Variant is null, cannot invoke', nil, 0, 0);
Expand Down Expand Up @@ -13858,44 +13860,46 @@ function IDispatchInvoke(Self: IDispatch; PropertySet: Boolean; const Name: tbtS

WSFreeList := TPSList.Create;
try
GetMem(DispParam.rgvarg, sizeof(TVariantArg) * (High(Par) + 1));
FillCHar(DispParam.rgvarg^, sizeof(TVariantArg) * (High(Par) + 1), 0);
aSize := SizeOf(TVariantArg) * (High(Par) + 1);
GetMem(DispParam.rgvarg, aSize);
FillChar(DispParam.rgvarg^, aSize, 0);
try
for i := 0 to High(Par) do
begin
if PVarData(@Par[High(Par)-i]).VType = varString then
ArgType := PVarData(@Par[High(Par)-i]).VType;
DispArg := @(DispParam.rgvarg{$IFDEF FPC}^{$ENDIF}[i]);
if ArgType = varString then
begin
DispParam.rgvarg[i].vt := VT_BSTR;
DispParam.rgvarg[i].bstrVal := StringToOleStr(AnsiString(Par[High(Par)-i]));
WSFreeList.Add(DispParam.rgvarg[i].bstrVal);
DispArg.vt := VT_BSTR;
DispArg.bstrVal := StringToOleStr(AnsiString(Par[High(Par)-i]));
WSFreeList.Add(DispArg.bstrVal);
{$IFDEF UNICODE}
end else if (PVarData(@Par[High(Par)-i]).VType = varOleStr) or (PVarData(@Par[High(Par)-i]).VType = varUString) then
end else if (ArgType = varOleStr) or (ArgType = varUString) then
begin
DispParam.rgvarg[i].vt := VT_BSTR;
DispParam.rgvarg[i].bstrVal := StringToOleStr(UnicodeString(Par[High(Par)-i]));
WSFreeList.Add(DispParam.rgvarg[i].bstrVal);
DispArg.vt := VT_BSTR;
DispArg.bstrVal := StringToOleStr(UnicodeString(Par[High(Par)-i]));
WSFreeList.Add(DispArg.bstrVal);
{$ENDIF}
end else if ArgType = varDispatch then
begin
// pass COM objects as plain VT_DISPATCH instead of a by-ref
// variant: strict marshalers (e.g. .NET COM interop) reject the
// wrapped form, and property assignments of IDispatch values only
// work this way. Deliberately without VT_BYREF, which is known to
// crash several COM servers.
DispArg.vt := VT_DISPATCH;
DispArg.dispVal := PVarData(@Par[High(Par)-i]).VDispatch;
end else
begin
DispParam.rgvarg[i].vt := VT_VARIANT or VT_BYREF;
DispArg.vt := VT_VARIANT or VT_BYREF;
New(
{$IFDEF DELPHI4UP}
POleVariant
{$ELSE}
PVariant{$ENDIF}
(DispParam.rgvarg[i].pvarVal));

(*
{$IFDEF DELPHI4UP}
POleVariant
{$ELSE}
PVariant
{$ENDIF}
(DispParam.rgvarg[i].pvarVal)^ := Par[High(Par)-i];
*)
Move(Par[High(Par)-i],Pointer(DispParam.rgvarg[i].pvarVal)^,
(DispArg.pvarVal));
Move(Par[High(Par)-i],Pointer(DispArg.pvarVal)^,
Sizeof({$IFDEF DELPHI4UP}OleVariant{$ELSE}Variant{$ENDIF}));

end;
end;
i :=Self.Invoke(DispatchId, GUID_NULL, LOCALE_SYSTEM_DEFAULT, Param, DispParam, @Result, @ExceptInfo, @ArgErr);
Expand Down Expand Up @@ -13929,20 +13933,21 @@ function IDispatchInvoke(Self: IDispatch; PropertySet: Boolean; const Name: tbtS
finally
for i := 0 to High(Par) do
begin
if DispParam.rgvarg[i].vt = (VT_VARIANT or VT_BYREF) then
DispArg := @(DispParam.rgvarg{$IFDEF FPC}^{$ENDIF}[i]);
if (DispArg.vt and VT_BYREF) = VT_BYREF then
begin
if{$IFDEF DELPHI4UP}POleVariant{$ELSE}PVariant{$ENDIF}
(DispParam.rgvarg[i].pvarVal) <> nil then
(DispArg.pvarVal) <> nil then
Dispose(
{$IFDEF DELPHI4UP}
POleVariant
{$ELSE}
PVariant
{$ENDIF}
(DispParam.rgvarg[i].pvarVal));
(DispArg.pvarVal));
end;
end;
FreeMem(DispParam.rgvarg, sizeof(TVariantArg) * (High(Par) + 1));
FreeMem(DispParam.rgvarg, aSize);
end;
finally
for i := WSFreeList.Count -1 downto 0 do
Expand Down