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

oleaut: Abstract out the processing of variables in SLTG typelib components to a common function.

This commit is contained in:
Robert Shearman 2006-07-03 13:54:01 +01:00 committed by Alexandre Julliard
parent bc6acf5c1d
commit e4188e8846
2 changed files with 77 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
dlls/oleaut32/typelib.c
View File

@ -2646,7 +2646,7 @@ static WORD *SLTG_DoType(WORD *pType, char *pBlk, TYPEDESC *pTD)
sizeof(TYPEDESC)); sizeof(TYPEDESC));
pTD = pTD->u.lptdesc; pTD = pTD->u.lptdesc;
} }
switch(*pType & 0x7f) { switch(*pType & 0x3f) {
case VT_PTR: case VT_PTR:
pTD->vt = VT_PTR; pTD->vt = VT_PTR;
pTD->u.lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pTD->u.lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
@ -2692,7 +2692,7 @@ static WORD *SLTG_DoType(WORD *pType, char *pBlk, TYPEDESC *pTD)
break; break;
} }
default: default:
pTD->vt = *pType & 0x7f; pTD->vt = *pType & 0x3f;
done = TRUE; done = TRUE;
break; break;
} }
@ -2823,6 +2823,70 @@ static char *SLTG_DoImpls(char *pBlk, ITypeInfoImpl *pTI,
return (char*)info; return (char*)info;
} }
static void SLTG_DoVars(char *pBlk, ITypeInfoImpl *pTI, unsigned short cVars, char *pNameTable)
{
TLBVarDesc **ppVarDesc = &pTI->varlist;
SLTG_Variable *pItem;
unsigned short i;
WORD *pType;
char buf[300];
for(pItem = (SLTG_Variable *)pBlk, i = 0; i < cVars;
pItem = (SLTG_Variable *)(pBlk + pItem->next), i++) {
*ppVarDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(**ppVarDesc));
(*ppVarDesc)->Name = TLB_MultiByteToBSTR(pItem->name + pNameTable);
(*ppVarDesc)->vardesc.memid = pItem->memid;
if(pItem->magic != SLTG_VAR_MAGIC) {
FIXME_(typelib)("var magic = %02x\n", pItem->magic);
return;
}
TRACE_(typelib)("byte_offs = 0x%x\n", pItem->byte_offs);
TRACE_(typelib)("memid = 0x%lx\n", pItem->memid);
if (pItem->flags & 0x40) {
TRACE_(typelib)("VAR_DISPATCH\n");
(*ppVarDesc)->vardesc.varkind = VAR_DISPATCH;
}
else if (pItem->flags & 0x10) {
TRACE_(typelib)("VAR_CONST\n");
(*ppVarDesc)->vardesc.varkind = VAR_CONST;
(*ppVarDesc)->vardesc.u.lpvarValue = HeapAlloc(GetProcessHeap(), 0,
sizeof(VARIANT));
V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_INT;
V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) =
*(INT*)(pBlk + pItem->byte_offs);
}
else {
TRACE_(typelib)("VAR_PERINSTANCE\n");
(*ppVarDesc)->vardesc.u.oInst = pItem->byte_offs;
(*ppVarDesc)->vardesc.varkind = VAR_PERINSTANCE;
}
if (pItem->flags & 0x80)
(*ppVarDesc)->vardesc.wVarFlags |= VARFLAG_FREADONLY;
if(pItem->flags & 0x02)
pType = &pItem->type;
else
pType = (WORD*)(pBlk + pItem->type);
if (pItem->flags & ~0xd2)
FIXME_(typelib)("unhandled flags = %02x\n", pItem->flags & ~0xd2);
SLTG_DoElem(pType, pBlk,
&(*ppVarDesc)->vardesc.elemdescVar);
dump_TypeDesc(&(*ppVarDesc)->vardesc.elemdescVar.tdesc, buf);
ppVarDesc = &((*ppVarDesc)->next);
}
pTI->TypeAttr.cVars = cVars;
}
static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
SLTG_TypeInfoTail *pTITail) SLTG_TypeInfoTail *pTITail)
@ -2963,47 +3027,7 @@ static void SLTG_ProcessRecord(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
SLTG_TypeInfoTail *pTITail) SLTG_TypeInfoTail *pTITail)
{ {
SLTG_RecordItem *pItem; SLTG_DoVars(pBlk, pTI, pTITail->cVars, pNameTable);
char *pFirstItem;
TLBVarDesc **ppVarDesc = &pTI->varlist;
int num = 0;
WORD *pType;
char buf[300];
pFirstItem = pBlk;
for(pItem = (SLTG_RecordItem *)pFirstItem, num = 1; 1;
pItem = (SLTG_RecordItem *)(pFirstItem + pItem->next), num++) {
if(pItem->magic != SLTG_RECORD_MAGIC) {
FIXME("record magic = %02x\n", pItem->magic);
return;
}
*ppVarDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(**ppVarDesc));
(*ppVarDesc)->Name = TLB_MultiByteToBSTR(pItem->name + pNameTable);
(*ppVarDesc)->vardesc.memid = pItem->memid;
(*ppVarDesc)->vardesc.u.oInst = pItem->byte_offs;
(*ppVarDesc)->vardesc.varkind = VAR_PERINSTANCE;
if(pItem->typepos == 0x02)
pType = &pItem->type;
else if(pItem->typepos == 0x00)
pType = (WORD*)(pFirstItem + pItem->type);
else {
FIXME("typepos = %02x\n", pItem->typepos);
break;
}
SLTG_DoElem(pType, pFirstItem,
&(*ppVarDesc)->vardesc.elemdescVar);
/* FIXME("helpcontext, helpstring\n"); */
dump_TypeDesc(&(*ppVarDesc)->vardesc.elemdescVar.tdesc, buf);
ppVarDesc = &((*ppVarDesc)->next);
if(pItem->next == 0xffff) break;
}
pTI->TypeAttr.cVars = num;
} }
static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI, static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI,
@ -3033,42 +3057,17 @@ static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
SLTG_TypeInfoTail *pTITail) SLTG_TypeInfoTail *pTITail)
{ {
FIXME("offset 0 0x%x\n",*(WORD*)pBlk); if (pTITail->vars_off != 0xffff)
SLTG_DoVars(pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable);
FIXME_(typelib)("process refs and funcs\n");
} }
static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI, static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
SLTG_TypeInfoTail *pTITail) SLTG_TypeInfoTail *pTITail)
{ {
SLTG_EnumItem *pItem; SLTG_DoVars(pBlk, pTI, pTITail->cVars, pNameTable);
char *pFirstItem;
TLBVarDesc **ppVarDesc = &pTI->varlist;
int num = 0;
pFirstItem = pBlk;
for(pItem = (SLTG_EnumItem *)pFirstItem, num = 1; 1;
pItem = (SLTG_EnumItem *)(pFirstItem + pItem->next), num++) {
if(pItem->magic != SLTG_ENUMITEM_MAGIC) {
FIXME("enumitem magic = %04x\n", pItem->magic);
return;
}
*ppVarDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(**ppVarDesc));
(*ppVarDesc)->Name = TLB_MultiByteToBSTR(pItem->name + pNameTable);
(*ppVarDesc)->vardesc.memid = pItem->memid;
(*ppVarDesc)->vardesc.u.lpvarValue = HeapAlloc(GetProcessHeap(), 0,
sizeof(VARIANT));
V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_INT;
V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) =
*(INT*)(pItem->value + pFirstItem);
(*ppVarDesc)->vardesc.elemdescVar.tdesc.vt = VT_I4;
(*ppVarDesc)->vardesc.varkind = VAR_CONST;
/* FIXME("helpcontext, helpstring\n"); */
ppVarDesc = &((*ppVarDesc)->next);
if(pItem->next == 0xffff) break;
}
pTI->TypeAttr.cVars = num;
} }
/* Because SLTG_OtherTypeInfo is such a painful struct, we make a more /* Because SLTG_OtherTypeInfo is such a painful struct, we make a more

10
dlls/oleaut32/typelib.h
View File

@ -571,17 +571,17 @@ typedef struct {
typedef struct { typedef struct {
BYTE magic; /* 0x0a */ BYTE magic; /* 0x0a */
BYTE typepos; BYTE flags;
WORD next; WORD next;
WORD name; WORD name;
WORD byte_offs; /* pos in struct */ WORD byte_offs; /* pos in struct, or offset to const type */
WORD type; /* if typepos == 0x02 this is the type, else offset to type */ WORD type; /* if flags & 0x02 this is the type, else offset to type */
DWORD memid; DWORD memid;
WORD helpcontext; /* ?? */ WORD helpcontext; /* ?? */
WORD helpstring; /* ?? */ WORD helpstring; /* ?? */
} SLTG_RecordItem; } SLTG_Variable;
#define SLTG_RECORD_MAGIC 0x0a #define SLTG_VAR_MAGIC 0x0a
/* CARRAYs look like this /* CARRAYs look like this