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

ole: Store the result from _invoke in a VARIANTARG structure.

This commit is contained in:
Robert Shearman 2006-01-05 12:18:54 +01:00 committed by Alexandre Julliard
parent ac37f4cc64
commit 83ff8560c3
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/oleaut32/typelib.c
View File

@ -5335,10 +5335,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
switch (func_desc->funckind) {
case FUNC_PUREVIRTUAL:
case FUNC_VIRTUAL: {
DWORD res;
int numargs, numargs2, argspos, args2pos;
DWORD *args , *args2;
VARIANT *rgvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT) * func_desc->cParams);
VARIANT varresult;
memcpy(rgvarg,pDispParams->rgvarg,sizeof(VARIANT)*pDispParams->cArgs);
hres = S_OK;
@ -5433,7 +5434,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
if (func_desc->cParamsOpt < 0)
FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt);
res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4],
V_VT(&varresult) = 0;
hres = typedescvt_to_variantvt((ITypeInfo *)iface, &func_desc->elemdescFunc.tdesc, &V_VT(&varresult));
if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */
V_ERROR(&varresult) = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4],
func_desc->callconv,
numargs,
args
@ -5479,11 +5484,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
}
}
if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res))
if ((V_VT(&varresult) == VT_ERROR) && FAILED(V_ERROR(&varresult)))
{
WARN("invoked function failed with error 0x%08lx\n", res);
WARN("invoked function failed with error 0x%08lx\n", V_ERROR(&varresult));
hres = DISP_E_EXCEPTION;
if (pExcepInfo) pExcepInfo->scode = res;
if (pExcepInfo) pExcepInfo->scode = V_ERROR(&varresult);
}
func_fail:
@ -5491,7 +5496,7 @@ func_fail:
HeapFree(GetProcessHeap(),0,args2);
HeapFree(GetProcessHeap(),0,args);
break;
}
}
case FUNC_DISPATCH: {
IDispatch *disp;