Skip to content

split DISPPARAMS instantiation in IDispatch.Invoke method with __make_dp method #485

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

Merged
merged 2 commits into from
Jun 5, 2023
Merged

split DISPPARAMS instantiation in IDispatch.Invoke method with __make_dp method #485

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9736791
make `DISPPARAMS` instantiation DRY
junkmd Jun 5, 2023
7d9bdf5
split `DISPPARAMS` instantiation in Invoke method
junkmd Jun 5, 2023
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
39 changes: 15 additions & 24 deletions comtypes/automation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,20 @@ def _invoke(self, memid: int, invkind: int, lcid: int, *args: Any) -> Any:
self.__com_Invoke(memid, riid_null, lcid, invkind, dp, var, None, argerr)
return var._get_value(dynamic=True)

def __make_dp(self, _invkind: int, *args: Any) -> DISPPARAMS:
array = (VARIANT * len(args))()
for i, a in enumerate(args[::-1]):
array[i].value = a
dp = DISPPARAMS()
dp.cArgs = len(args)
dp.rgvarg = array
if _invkind in (DISPATCH_PROPERTYPUT, DISPATCH_PROPERTYPUTREF): # propput
dp.cNamedArgs = 1
dp.rgdispidNamedArgs = pointer(DISPID(DISPID_PROPERTYPUT))
else:
dp.cNamedArgs = 0
return dp

def Invoke(self, dispid: int, *args: Any, **kw: Any) -> Any:
"""Invoke a method or property."""

Expand All @@ -857,33 +871,10 @@ def Invoke(self, dispid: int, *args: Any, **kw: Any) -> Any:
_lcid = kw.pop("_lcid", 0)
if kw:
raise ValueError("named parameters not yet implemented")

dp = self.__make_dp(_invkind, *args)
result = VARIANT()
excepinfo = EXCEPINFO()
argerr = c_uint()

if _invkind in (DISPATCH_PROPERTYPUT, DISPATCH_PROPERTYPUTREF): # propput
array = (VARIANT * len(args))()

for i, a in enumerate(args[::-1]):
array[i].value = a

dp = DISPPARAMS()
dp.cArgs = len(args)
dp.cNamedArgs = 1
dp.rgvarg = array
dp.rgdispidNamedArgs = pointer(DISPID(DISPID_PROPERTYPUT))
else:
array = (VARIANT * len(args))()

for i, a in enumerate(args[::-1]):
array[i].value = a

dp = DISPPARAMS()
dp.cArgs = len(args)
dp.cNamedArgs = 0
dp.rgvarg = array

try:
self.__com_Invoke(
dispid,
Expand Down