ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Cleanup formating of DispCallFunc. 

- Fix DispCallFunc for functions with return values.
- Don't rely on _copy_arg as it is going away soon.
This commit is contained in:
Robert Shearman 2005-11-09 10:31:20 +00:00 committed by Alexandre Julliard
parent ae542af541
commit 7dc54af325
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dlls/oleaut32/typelib.c
View File

@ -4862,46 +4862,47 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYP
HRESULT WINAPI HRESULT WINAPI
DispCallFunc( DispCallFunc(
void* pvInstance, ULONG oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, void* pvInstance, ULONG oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals,
VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult)
) { {
int i, argsize, argspos; int i, argsize, argspos;
DWORD *args; DWORD *args;
HRESULT hres; HRESULT hres;
TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n",
pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult) pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg,
); pvargResult, V_VT(pvargResult));
/* DispCallFunc is only used to invoke methods belonging to an IDispatch-derived COM interface.
So we need to add a first parameter to the list of arguments, to supply the interface pointer */ /* DispCallFunc is only used to invoke methods belonging to an
* IDispatch-derived COM interface. So we need to add a first parameter
* to the list of arguments, to supply the interface pointer */
argsize = 1; argsize = 1;
for (i=0;i<cActuals;i++) { for (i=0;i<cActuals;i++)
TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); {
dump_Variant(prgpvarg[i]); TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i]));
argsize += _argsize(prgvt[i]); dump_Variant(prgpvarg[i]);
argsize += _argsize(prgvt[i]);
} }
args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize);
args[0] = (DWORD)pvInstance; /* this is the fake IDispatch interface pointer */ args[0] = (DWORD)pvInstance; /* this is the fake IDispatch interface pointer */
argspos = 1; argspos = 1;
for (i=0;i<cActuals;i++) { for (i=0;i<cActuals;i++)
VARIANT *arg = prgpvarg[i]; {
TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); VARIANT *arg = prgpvarg[i];
_copy_arg(NULL, NULL, &args[argspos], arg, prgvt[i]); TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]);
argspos += _argsize(prgvt[i]); memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD));
argspos += _argsize(prgvt[i]);
} }
if(pvargResult!=NULL && V_VT(pvargResult)==VT_EMPTY) hres = _invoke((*(FARPROC**)pvInstance)[oVft/sizeof(void *)],cc,argsize,args);
if (pvargResult && (vtReturn != VT_EMPTY))
{ {
_invoke((*(FARPROC**)pvInstance)[oVft/4],cc,argsize,args); TRACE("Method returned 0x%08lx\n",hres);
hres=S_OK; V_VT(pvargResult) = vtReturn;
} V_UI4(pvargResult) = hres;
else
{
FIXME("Do not know how to handle pvargResult %p. Expect crash ...\n",pvargResult);
hres = _invoke((*(FARPROC**)pvInstance)[oVft/4],cc,argsize,args);
FIXME("Method returned %lx\n",hres);
} }
HeapFree(GetProcessHeap(),0,args); HeapFree(GetProcessHeap(),0,args);
return hres; return S_OK;
} }
static HRESULT WINAPI ITypeInfo_fnInvoke( static HRESULT WINAPI ITypeInfo_fnInvoke(