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

oleaut32: Make sure to read the memid and the name offset from the 

correct offsets, after the function data, so add cFuncs to the offsets
in MSFT_DoVars.

Resolve referenced types for variables.
Fixes initialisation of the dbgrid32 OCX.
This commit is contained in:
Robert Shearman 2006-05-31 12:20:39 +01:00 committed by Alexandre Julliard
parent 983ad4accd
commit 9c738061e0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/oleaut32/typelib.c
View File

@ -1899,7 +1899,7 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs,
*pptvd=TLB_Alloc(sizeof(TLBVarDesc)); *pptvd=TLB_Alloc(sizeof(TLBVarDesc));
/* name, eventually add to a hash table */ /* name, eventually add to a hash table */
MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx, MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx,
offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT)); offset + infolen + (2*cFuncs + cVars + i + 1) * sizeof(INT));
(*pptvd)->Name=MSFT_ReadName(pcx, nameoffset); (*pptvd)->Name=MSFT_ReadName(pcx, nameoffset);
/* read the variable information record */ /* read the variable information record */
MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset);
@ -1915,7 +1915,7 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs,
(*pptvd)->HelpStringContext=pVarRec->HelpStringContext; (*pptvd)->HelpStringContext=pVarRec->HelpStringContext;
/* fill the VarDesc Structure */ /* fill the VarDesc Structure */
MSFT_ReadLEDWords(&(*pptvd)->vardesc.memid, sizeof(INT), pcx, MSFT_ReadLEDWords(&(*pptvd)->vardesc.memid, sizeof(INT), pcx,
offset + infolen + ( i + 1) * sizeof(INT)); offset + infolen + (cFuncs + i + 1) * sizeof(INT));
(*pptvd)->vardesc.varkind = pVarRec->VarKind; (*pptvd)->vardesc.varkind = pVarRec->VarKind;
(*pptvd)->vardesc.wVarFlags = pVarRec->Flags; (*pptvd)->vardesc.wVarFlags = pVarRec->Flags;
MSFT_GetTdesc(pcx, pVarRec->DataType, MSFT_GetTdesc(pcx, pVarRec->DataType,
@ -1927,6 +1927,7 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs,
pVarRec->OffsValue, pcx); pVarRec->OffsValue, pcx);
} else } else
(*pptvd)->vardesc.u.oInst=pVarRec->OffsValue; (*pptvd)->vardesc.u.oInst=pVarRec->OffsValue;
MSFT_ResolveReferencedTypes(pcx, pTI, &(*pptvd)->vardesc.elemdescVar.tdesc);
pptvd=&((*pptvd)->next); pptvd=&((*pptvd)->next);
recoffset += reclength; recoffset += reclength;
} }