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

oleaut32: typelib - fix regression in MSFT typelib parsing.

Browse Source
This commit is contained in:
Alex Villacís Lasso 2006-11-08 19:33:46 -05:00 committed by Alexandre Julliard
parent 6bf97313bc
commit 64410e5907
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/oleaut32/typelib.c
View File

@ -1173,7 +1173,7 @@ static void dump_TLBFuncDescOne(const TLBFuncDesc * pfd)
dump_FUNCDESC(&(pfd->funcdesc)); dump_FUNCDESC(&(pfd->funcdesc));
MESSAGE("\thelpstring: %s\n", debugstr_w(pfd->HelpString)); MESSAGE("\thelpstring: %s\n", debugstr_w(pfd->HelpString));
MESSAGE("\tentry: %s\n", debugstr_w(pfd->Entry)); MESSAGE("\tentry: %s\n", (pfd->Entry == (void *)-1) ? "invalid" : debugstr_w(pfd->Entry));
} }
static void dump_TLBFuncDesc(const TLBFuncDesc * pfd) static void dump_TLBFuncDesc(const TLBFuncDesc * pfd)
{ {
@ -1813,7 +1813,9 @@ MSFT_DoFuncs(TLBContext* pcx,
{ {
if ( pFuncRec->FKCCIC & 0x2000 ) if ( pFuncRec->FKCCIC & 0x2000 )
{ {
(*pptfd)->Entry = SysAllocString((WCHAR*)pFuncRec->OptAttr[2]); if (HIWORD(pFuncRec->OptAttr[2]) != 0)
ERR("ordinal 0x%08x invalid, HIWORD != 0\n", pFuncRec->OptAttr[2]);
(*pptfd)->Entry = (BSTR)pFuncRec->OptAttr[2];
} }
else else
{ {
@ -1832,6 +1834,10 @@ MSFT_DoFuncs(TLBContext* pcx,
} }
} }
} }
else
{
(*pptfd)->Entry = (BSTR)-1;
}
} }
} }
@ -4437,6 +4443,7 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface)
pCustDataNext = pCustData->next; pCustDataNext = pCustData->next;
TLB_Free(pCustData); TLB_Free(pCustData);
} }
if (HIWORD(pFInfo->Entry) != 0 && pFInfo->Entry != (BSTR)-1)
SysFreeString(pFInfo->Entry); SysFreeString(pFInfo->Entry);
SysFreeString(pFInfo->HelpString); SysFreeString(pFInfo->HelpString);
SysFreeString(pFInfo->Name); SysFreeString(pFInfo->Name);