system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 05:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

OLE: Fix brokenness in typelib marshaller caused by dispinterface retval fix.

Browse source 
Fix more fallout from dispinterface retval patch: make typelib
marshaler use the internal function description so that it calls
dispinterface functions with the correct number of parameters again.
Also fixes some memory leaks caused by the fact that a corresponding
ReleaseXDesc function has to be called for each GetXDesc.
This commit is contained in:
Robert Shearman 2005-12-06 21:24:19 +01:00 committed by Alexandre Julliard
parent 36f112973e
commit b0d8e06caf
3 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/oleaut32/tmarshal.c
View file

@ -304,12 +304,12 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) {
*/
static int _nroffuncs(ITypeInfo *tinfo) {
int n, max = 0;
FUNCDESC *fdesc;
const FUNCDESC *fdesc;
HRESULT hres;
n=0;
while (1) {
hres = ITypeInfo_GetFuncDesc(tinfo,n,&fdesc);
hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo,n,&fdesc);
if (hres)
return max+1;
if (fdesc->oVft/4 > max)
@ -1053,6 +1053,7 @@ deserialize_param(
(DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst),
buf
);
ITypeInfo2_ReleaseVarDesc(tinfo2, vdesc);
if (debugout && (i<tattr->cVars-1)) TRACE_(olerelay)(",");
}
if (debugout) TRACE_(olerelay)("}");
@ -1108,7 +1109,7 @@ deserialize_param(
/* Searches function, also in inherited interfaces */
static HRESULT
_get_funcdesc(
ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, FUNCDESC **fdesc, BSTR *iname, BSTR *fname)
ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, const FUNCDESC **fdesc, BSTR *iname, BSTR *fname)
{
int i = 0, j = 0;
HRESULT hres;
@ -1120,7 +1121,8 @@ _get_funcdesc(
ITypeInfo_AddRef(*tactual);
while (1) {
hres = ITypeInfo_GetFuncDesc(tinfo, i, fdesc);
hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i, fdesc);
if (hres) {
ITypeInfo *tinfo2;
HREFTYPE href;
@ -1164,7 +1166,7 @@ static DWORD
xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */)
{
DWORD *args = ((DWORD*)&tpinfo)+1, *xargs;
FUNCDESC *fdesc;
const FUNCDESC *fdesc;
HRESULT hres;
int i, relaydeb = TRACE_ON(olerelay);
marshal_state buf;
@ -1451,7 +1453,7 @@ PSFacBuf_CreateProxy(
HRESULT hres;
ITypeInfo *tinfo;
int i, nroffuncs;
FUNCDESC *fdesc;
const FUNCDESC *fdesc;
TMProxyImpl *proxy;
TYPEATTR *typeattr;
@ -1647,7 +1649,7 @@ TMStubImpl_Invoke(
LPRPCSTUBBUFFER iface, RPCOLEMESSAGE* xmsg,IRpcChannelBuffer*rpcchanbuf)
{
int i;
FUNCDESC *fdesc;
const FUNCDESC *fdesc;
TMStubImpl *This = (TMStubImpl *)iface;
HRESULT hres;
DWORD *args, res, *xargs, nrofargs;

38
dlls/oleaut32/typelib.c
View file

@ -4489,6 +4489,24 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt
return S_OK;
}
HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc )
{
ITypeInfoImpl *This = (ITypeInfoImpl *)iface;
const TLBFuncDesc *pFDesc;
int i;
for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next)
;
if (pFDesc)
{
*ppFuncDesc = &pFDesc->funcdesc;
return S_OK;
}
return E_INVALIDARG;
}
/* ITypeInfo::GetFuncDesc
*
* Retrieves the FUNCDESC structure that contains information about a
@ -4499,21 +4517,19 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index,
LPFUNCDESC *ppFuncDesc)
{
ITypeInfoImpl *This = (ITypeInfoImpl *)iface;
int i;
const TLBFuncDesc *pFDesc;
const FUNCDESC *internal_funcdesc;
HRESULT hr;
TRACE("(%p) index %d\n", This, index);
for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next)
;
hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc);
if (FAILED(hr))
return hr;
if(pFDesc)
return TLB_AllocAndInitFuncDesc(
&pFDesc->funcdesc,
ppFuncDesc,
This->TypeAttr.typekind == TKIND_DISPATCH);
return E_INVALIDARG;
return TLB_AllocAndInitFuncDesc(
internal_funcdesc,
ppFuncDesc,
This->TypeAttr.typekind == TKIND_DISPATCH);
}
static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr )

2
dlls/oleaut32/typelib.h
View file

@ -600,6 +600,8 @@ WORD typeofarray
#include "poppack.h"
HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc );
extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args);
extern void dump_Variant(const VARIANT * pvar);