Skip to content

W
wine-winehq
Commit 23e089a0 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

oleaut: Rename SLTG_DoType to SLTG_DoElem and split out the common TYPEDESC…

oleaut: Rename SLTG_DoType to SLTG_DoElem and split out the common TYPEDESC generating code to SLTG_DoType. Process SLTG alias types with SLTG_DoType as the data is stored in the same format as in other components of the typelib.
parent 663fb8bd
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 53 deletions
dlls/oleaut32/typelib.c
View file @ 23e089a0
...@@ -2635,26 +2635,9 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) ...@@ -2635,26 +2635,9 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl)
return ptr - (char*)pLibBlk; return ptr - (char*)pLibBlk;
} }
static WORD *SLTG_DoType(WORD *pType, char *pBlk, ELEMDESC *pElem) static WORD *SLTG_DoType(WORD *pType, char *pBlk, TYPEDESC *pTD)
{ {
BOOL done = FALSE; BOOL done = FALSE;
TYPEDESC *pTD = &pElem->tdesc;
/* Handle [in/out] first */
if((*pType & 0xc000) == 0xc000)
pElem->u.paramdesc.wParamFlags = PARAMFLAG_NONE;
else if(*pType & 0x8000)
pElem->u.paramdesc.wParamFlags = PARAMFLAG_FIN | PARAMFLAG_FOUT;
else if(*pType & 0x4000)
pElem->u.paramdesc.wParamFlags = PARAMFLAG_FOUT;
else
pElem->u.paramdesc.wParamFlags = PARAMFLAG_FIN;
if(*pType & 0x2000)
pElem->u.paramdesc.wParamFlags |= PARAMFLAG_FLCID;
if(*pType & 0x80)
pElem->u.paramdesc.wParamFlags |= PARAMFLAG_FRETVAL;
while(!done) { while(!done) {
if((*pType & 0xe00) == 0xe00) { if((*pType & 0xe00) == 0xe00) {
...@@ -2718,6 +2701,27 @@ static WORD *SLTG_DoType(WORD *pType, char *pBlk, ELEMDESC *pElem) ...@@ -2718,6 +2701,27 @@ static WORD *SLTG_DoType(WORD *pType, char *pBlk, ELEMDESC *pElem)
return pType; return pType;
} }
static WORD *SLTG_DoElem(WORD *pType, char *pBlk, ELEMDESC *pElem)
{
/* Handle [in/out] first */
if((*pType & 0xc000) == 0xc000)
pElem->u.paramdesc.wParamFlags = PARAMFLAG_NONE;
else if(*pType & 0x8000)
pElem->u.paramdesc.wParamFlags = PARAMFLAG_FIN | PARAMFLAG_FOUT;
else if(*pType & 0x4000)
pElem->u.paramdesc.wParamFlags = PARAMFLAG_FOUT;
else
pElem->u.paramdesc.wParamFlags = PARAMFLAG_FIN;
if(*pType & 0x2000)
pElem->u.paramdesc.wParamFlags |= PARAMFLAG_FLCID;
if(*pType & 0x80)
pElem->u.paramdesc.wParamFlags |= PARAMFLAG_FRETVAL;
return SLTG_DoType(pType, pBlk, &pElem->tdesc);
}
static void SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeInfoImpl *pTI, static void SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeInfoImpl *pTI,
char *pNameTable) char *pNameTable)
...@@ -2889,7 +2893,7 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, ...@@ -2889,7 +2893,7 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
pType = (WORD*)(pFirstItem + pFunc->rettype); pType = (WORD*)(pFirstItem + pFunc->rettype);
SLTG_DoType(pType, pFirstItem, &(*ppFuncDesc)->funcdesc.elemdescFunc); SLTG_DoElem(pType, pFirstItem, &(*ppFuncDesc)->funcdesc.elemdescFunc);
(*ppFuncDesc)->funcdesc.lprgelemdescParam = (*ppFuncDesc)->funcdesc.lprgelemdescParam =
HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
...@@ -2926,13 +2930,13 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, ...@@ -2926,13 +2930,13 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
if(HaveOffs) { /* the next word is an offset to type */ if(HaveOffs) { /* the next word is an offset to type */
pType = (WORD*)(pFirstItem + *pArg); pType = (WORD*)(pFirstItem + *pArg);
SLTG_DoType(pType, pFirstItem, SLTG_DoElem(pType, pFirstItem,
&(*ppFuncDesc)->funcdesc.lprgelemdescParam[param]); &(*ppFuncDesc)->funcdesc.lprgelemdescParam[param]);
pArg++; pArg++;
} else { } else {
if(paramName) if(paramName)
paramName--; paramName--;
pArg = SLTG_DoType(pArg, pFirstItem, pArg = SLTG_DoElem(pArg, pFirstItem,
&(*ppFuncDesc)->funcdesc.lprgelemdescParam[param]); &(*ppFuncDesc)->funcdesc.lprgelemdescParam[param]);
} }
...@@ -2989,7 +2993,7 @@ static void SLTG_ProcessRecord(char *pBlk, ITypeInfoImpl *pTI, ...@@ -2989,7 +2993,7 @@ static void SLTG_ProcessRecord(char *pBlk, ITypeInfoImpl *pTI,
break; break;
} }
SLTG_DoType(pType, pFirstItem, SLTG_DoElem(pType, pFirstItem,
&(*ppVarDesc)->vardesc.elemdescVar); &(*ppVarDesc)->vardesc.elemdescVar);
/* FIXME("helpcontext, helpstring\n"); */ /* FIXME("helpcontext, helpstring\n"); */
...@@ -3006,8 +3010,7 @@ static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI, ...@@ -3006,8 +3010,7 @@ static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
SLTG_TypeInfoTail *pTITail) SLTG_TypeInfoTail *pTITail)
{ {
SLTG_AliasItem *pItem; WORD *pType;
TYPEDESC *tdesc = &pTI->TypeAttr.tdescAlias;
if (pTITail->simple_alias) { if (pTITail->simple_alias) {
/* if simple alias, no more processing required */ /* if simple alias, no more processing required */
...@@ -3015,27 +3018,10 @@ static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI, ...@@ -3015,27 +3018,10 @@ static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI,
return; return;
} }
/* otherwise it is an offset */ /* otherwise it is an offset to a type */
pItem = (SLTG_AliasItem *)(pBlk + pTITail->tdescalias_vt); pType = (WORD *)(pBlk + pTITail->tdescalias_vt);
/* This is used for creating a TYPEDESC chain in case of VT_USERDEFINED */ SLTG_DoType(pType, pBlk, &pTI->TypeAttr.tdescAlias);
while (TRUE) {
if (pItem->flags != 0)
FIXME("unknown flag(s) 0x%x for type 0x%x\n", pItem->flags, pItem->vt);
if (pItem->vt == VT_USERDEFINED) {
tdesc->vt = pItem->vt;
/* guessing here ... */
pItem++;
tdesc->u.hreftype = *(WORD *)pItem;
pItem = (SLTG_AliasItem *)((char *)pItem + sizeof(WORD));
FIXME("Guessing TKIND_ALIAS of VT_USERDEFINED with hreftype 0x%lx\n", tdesc->u.hreftype);
break;
} else {
FIXME("unhandled alias vt 0x%x\n", pItem->vt);
break;
}
}
} }
static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI, static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI,
......
dlls/oleaut32/typelib.h
View file @ 23e089a0
...@@ -477,14 +477,6 @@ typedef struct { ...@@ -477,14 +477,6 @@ typedef struct {
#define SLTG_ENUMITEM_MAGIC 0x120a #define SLTG_ENUMITEM_MAGIC 0x120a
typedef struct { typedef struct {
/*00*/ BYTE vt; /* vartype */
/*01*/ BYTE flags; /* unknown flags */
} SLTG_AliasItem;
#define SLTG_ALIASITEM_MAGIC 0x001d
typedef struct {
BYTE magic; /* 0x4c or 0x6c */ BYTE magic; /* 0x4c or 0x6c */
BYTE inv; /* high nibble is INVOKE_KIND, low nibble = 2 */ BYTE inv; /* high nibble is INVOKE_KIND, low nibble = 2 */
WORD next; /* byte offset from beginning of group to next fn */ WORD next; /* byte offset from beginning of group to next fn */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment