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

OLE: ITypeInfo_Invoke parameter naming change. 

Rename the dwFlags parameter of ITypeInfo_Invoke since it is not a
DWORD, but an unsigned short.
This commit is contained in:
Robert Shearman 2005-12-06 10:57:45 +01:00 committed by Alexandre Julliard
parent 5ba7b1778c
commit 3dd7ba394c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/oleaut32/typelib.c
View File

@ -5208,7 +5208,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
ITypeInfo2 *iface, ITypeInfo2 *iface,
VOID *pIUnk, VOID *pIUnk,
MEMBERID memid, MEMBERID memid,
UINT16 dwFlags, UINT16 wFlags,
DISPPARAMS *pDispParams, DISPPARAMS *pDispParams,
VARIANT *pVarResult, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, EXCEPINFO *pExcepInfo,
@ -5221,15 +5221,15 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
HRESULT hres; HRESULT hres;
const TLBFuncDesc *pFuncInfo; const TLBFuncDesc *pFuncInfo;
TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p) partial stub!\n", TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p)\n",
This,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr
); );
dump_DispParms(pDispParams); dump_DispParms(pDispParams);
/* we do this instead of using GetFuncDesc since it will return a fake /* we do this instead of using GetFuncDesc since it will return a fake
* FUNCDESC for dispinterfaces and we want the real function description */ * FUNCDESC for dispinterfaces and we want the real function description */
for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next)
if (memid == pFuncInfo->funcdesc.memid && (dwFlags & pFuncInfo->funcdesc.invkind)) if (memid == pFuncInfo->funcdesc.memid && (wFlags & pFuncInfo->funcdesc.invkind))
break; break;
if (pFuncInfo) { if (pFuncInfo) {
@ -5395,7 +5395,7 @@ func_fail:
if (SUCCEEDED(hres)) { if (SUCCEEDED(hres)) {
FIXME("Calling Invoke in IDispatch iface. untested!\n"); FIXME("Calling Invoke in IDispatch iface. untested!\n");
hres = IDispatch_Invoke( hres = IDispatch_Invoke(
disp,memid,&IID_NULL,LOCALE_USER_DEFAULT,dwFlags,pDispParams, disp,memid,&IID_NULL,LOCALE_USER_DEFAULT,wFlags,pDispParams,
pVarResult,pExcepInfo,pArgErr pVarResult,pExcepInfo,pArgErr
); );
if (FAILED(hres)) if (FAILED(hres))
@ -5435,14 +5435,14 @@ func_fail:
ITypeInfo *pTInfo; ITypeInfo *pTInfo;
hres = ITypeInfo_GetRefTypeInfo(iface, ref_type, &pTInfo); hres = ITypeInfo_GetRefTypeInfo(iface, ref_type, &pTInfo);
if(SUCCEEDED(hres)){ if(SUCCEEDED(hres)){
hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr); hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr);
ITypeInfo_Release(pTInfo); ITypeInfo_Release(pTInfo);
return hres; return hres;
} }
WARN("Could not search inherited interface!\n"); WARN("Could not search inherited interface!\n");
} }
} }
ERR("did not find member id %08lx, flags %d!\n", memid, dwFlags); ERR("did not find member id %ld, flags 0x%x!\n", memid, wFlags);
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
} }