reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 04:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oleaut32: Improve ICreateTypeInfo_LayOut implementation.

Browse Source
This commit is contained in:
Piotr Caban 2010-03-15 23:40:31 +01:00 committed by Alexandre Julliard
parent aecd956b7e
commit 2184674779
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/oleaut32/typelib2.c
View File

@ -2360,6 +2360,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(
TRACE("(%p)\n", iface);
/* FIXME: LayOut should be run on all ImplTypes */
if(This->typekind == TKIND_COCLASS)
return S_OK;
@ -2429,7 +2430,34 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(
ITypeInfo_Release(cur);
}
This->typeinfo->cbSizeVft = (This->typeinfo->datatype2>>16) * 4;
/* Get cbSizeVft of inherited interface */
/* Makes LayOut running recursively */
if(This->typeinfo->datatype1 != -1) {
ITypeInfo *cur, *inherited;
TYPEATTR *typeattr;
hres = ICreateTypeInfo_QueryInterface(iface, &IID_ITypeInfo, (void**)&cur);
if(FAILED(hres))
return hres;
hres = ITypeInfo_GetRefTypeInfo(cur, This->typeinfo->datatype1, &inherited);
ITypeInfo_Release(cur);
if(FAILED(hres))
return hres;
hres = ITypeInfo_GetTypeAttr(inherited, &typeattr);
if(FAILED(hres)) {
ITypeInfo_Release(inherited);
return hres;
}
This->typeinfo->cbSizeVft = typeattr->cbSizeVft;
ITypeInfo_ReleaseTypeAttr(inherited, typeattr);
ITypeInfo_Release(inherited);
} else
This->typeinfo->cbSizeVft = 0;
if(!This->typedata)
return S_OK;