Skip to content

W
wine-winehq
Commit 6b974380 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

oleaut32: Convert some tabs to spaces and some other formatting changes.

parent fa49c971
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 64 deletions
dlls/oleaut32/typelib.c
View file @ 6b974380
...@@ -5326,41 +5326,44 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( ...@@ -5326,41 +5326,44 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
switch (func_desc->funckind) { switch (func_desc->funckind) {
case FUNC_PUREVIRTUAL: case FUNC_PUREVIRTUAL:
case FUNC_VIRTUAL: { case FUNC_VIRTUAL: {
DWORD res; DWORD res;
int numargs, numargs2, argspos, args2pos; int numargs, numargs2, argspos, args2pos;
DWORD *args , *args2; DWORD *args , *args2;
VARIANT *rgvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT) * func_desc->cParams); VARIANT *rgvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT) * func_desc->cParams);
memcpy(rgvarg,pDispParams->rgvarg,sizeof(VARIANT)*pDispParams->cArgs); memcpy(rgvarg,pDispParams->rgvarg,sizeof(VARIANT)*pDispParams->cArgs);
hres = S_OK; hres = S_OK;
numargs = 1; /* sizeof(thisptr) */ numargs = 1; /* sizeof(thisptr) */
numargs2 = 0; numargs2 = 0;
for (i = 0; i < func_desc->cParams; i++) { for (i = 0; i < func_desc->cParams; i++)
{
TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc;
numargs += _argsize(tdesc->vt); numargs += _argsize(tdesc->vt);
if (i>=pDispParams->cArgs) { /* arguments to return */ if (i>=pDispParams->cArgs) { /* arguments to return */
if (tdesc->vt == VT_PTR) { if (tdesc->vt == VT_PTR) {
numargs2 += _argsize(tdesc->u.lptdesc->vt); numargs2 += _argsize(tdesc->u.lptdesc->vt);
} else { } else {
FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt); FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt);
numargs2 += _argsize(tdesc->vt); numargs2 += _argsize(tdesc->vt);
} }
} }
} }
args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs); args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs);
args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2); args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2);
args[0] = (DWORD)pIUnk; args[0] = (DWORD)pIUnk;
argspos = 1; args2pos = 0; argspos = 1; args2pos = 0;
for (i = 0; i < func_desc->cParams; i++) { for (i = 0; i < func_desc->cParams; i++)
ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]); {
TYPEDESC *tdesc = &(elemdesc->tdesc); ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]);
USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags; TYPEDESC *tdesc = &(elemdesc->tdesc);
int arglen = _argsize(tdesc->vt); USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags;
int arglen = _argsize(tdesc->vt);
if (i<pDispParams->cArgs) { if (i<pDispParams->cArgs)
{
VARIANT *arg = &rgvarg[pDispParams->cArgs-i-1]; VARIANT *arg = &rgvarg[pDispParams->cArgs-i-1];
if (paramFlags & PARAMFLAG_FOPT) { if (paramFlags & PARAMFLAG_FOPT) {
...@@ -5381,7 +5384,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( ...@@ -5381,7 +5384,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt);
if (FAILED(hres)) goto func_fail; if (FAILED(hres)) goto func_fail;
argspos += arglen; argspos += arglen;
} else if (paramFlags & PARAMFLAG_FOPT) { }
else if (paramFlags & PARAMFLAG_FOPT)
{
VARIANT *arg = &rgvarg[i]; VARIANT *arg = &rgvarg[i];
if (i < func_desc->cParams - func_desc->cParamsOpt) if (i < func_desc->cParams - func_desc->cParamsOpt)
...@@ -5395,36 +5400,38 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( ...@@ -5395,36 +5400,38 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt);
if (FAILED(hres)) goto func_fail; if (FAILED(hres)) goto func_fail;
argspos += arglen; argspos += arglen;
} else { }
if (tdesc->vt == VT_PTR) else
arglen = _argsize(tdesc->u.lptdesc->vt); {
else if (tdesc->vt == VT_PTR)
FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt); arglen = _argsize(tdesc->u.lptdesc->vt);
else
/* Supply pointers for the rest, so propertyget works*/ FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt);
args[argspos] = (DWORD)&args2[args2pos];
/* Supply pointers for the rest, so propertyget works*/
/* If pointer to variant, pass reference it. */ args[argspos] = (DWORD)&args2[args2pos];
if ((tdesc->vt == VT_PTR) &&
(tdesc->u.lptdesc->vt == VT_VARIANT) && /* If pointer to variant, pass reference it. */
pVarResult if ((tdesc->vt == VT_PTR) &&
(tdesc->u.lptdesc->vt == VT_VARIANT) &&
pVarResult
) )
args[argspos]= (DWORD)pVarResult; args[argspos]= (DWORD)pVarResult;
argspos += 1; argspos += 1;
args2pos += arglen; args2pos += arglen;
} }
} }
if (func_desc->cParamsOpt < 0) if (func_desc->cParamsOpt < 0)
FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt);
res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4],
func_desc->callconv, func_desc->callconv,
numargs, numargs,
args args
); );
if (pVarResult) { if (pVarResult) {
for (i = 0; i < func_desc->cParams; i++) { for (i = 0; i < func_desc->cParams; i++) {
USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags;
if (wParamFlags & PARAMFLAG_FRETVAL) { if (wParamFlags & PARAMFLAG_FRETVAL) {
ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i];
...@@ -5455,19 +5462,21 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( ...@@ -5455,19 +5462,21 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
IUnknown_Release(*V_UNKNOWNREF(&varresult)); IUnknown_Release(*V_UNKNOWNREF(&varresult));
} }
break; break;
} }
} }
} }
if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res))
{
WARN("invoked function failed with error 0x%08lx\n", res);
hres = DISP_E_EXCEPTION;
if (pExcepInfo) pExcepInfo->scode = res;
}
if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) {
WARN("invoked function failed with error 0x%08lx\n", res);
hres = DISP_E_EXCEPTION;
if (pExcepInfo) pExcepInfo->scode = res;
}
func_fail: func_fail:
HeapFree(GetProcessHeap(), 0, rgvarg); HeapFree(GetProcessHeap(), 0, rgvarg);
HeapFree(GetProcessHeap(),0,args2); HeapFree(GetProcessHeap(),0,args2);
HeapFree(GetProcessHeap(),0,args); HeapFree(GetProcessHeap(),0,args);
break; break;
} }
case FUNC_DISPATCH: { case FUNC_DISPATCH: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment