July 2006 - Wine-commits - list.winehq.org

Robert Shearman : oleaut: Move the initialisation of memidConstructor and
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 8a50262fdb1565cd6fef4df36caa016284bceecf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a50262fdb1565cd6fef4df… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:54:21 2006 +0100 oleaut: Move the initialisation of memidConstructor and memidDestructor of type infos to the common ITypeInfo creation function. Remove the WARN message as this functionality isn't implemented in native either. --- dlls/oleaut32/typelib.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 35dd770..efe1720 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2047,12 +2047,9 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->pTypeLib = pLibInfo; ptiRet->index=count; /* fill in the typeattr fields */ - WARN("Assign constructor/destructor memid\n"); MSFT_ReadGuid(&ptiRet->TypeAttr.guid, tiBase.posguid, pcx); ptiRet->TypeAttr.lcid=pLibInfo->LibAttr.lcid; /* FIXME: correct? */ - ptiRet->TypeAttr.memidConstructor=MEMBERID_NIL ;/* FIXME */ - ptiRet->TypeAttr.memidDestructor=MEMBERID_NIL ; /* FIXME */ ptiRet->TypeAttr.lpstrSchema=NULL; /* reserved */ ptiRet->TypeAttr.cbSizeInstance=tiBase.size; ptiRet->TypeAttr.typekind=tiBase.typekind & 0xF; @@ -4193,6 +4190,8 @@ static ITypeInfo2 * WINAPI ITypeInfo_Con pTypeInfoImpl->lpVtblTypeComp = &tcompvt; pTypeInfoImpl->ref=1; pTypeInfoImpl->hreftype = -1; + pTypeInfoImpl->TypeAttr.memidConstructor = MEMBERID_NIL; + pTypeInfoImpl->TypeAttr.memidDestructor = MEMBERID_NIL; } TRACE("(%p)\n", pTypeInfoImpl); return (ITypeInfo2*) pTypeInfoImpl;

1 0

Robert Shearman : oleaut: Move the processing of functions in SLTG typelibs into a
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: f2eb2d230922a10455069fe381182f957cf3b62e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2eb2d230922a10455069fe… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:54:29 2006 +0100 oleaut: Move the processing of functions in SLTG typelibs into a separate function and use it when processing dispinterfaces. --- dlls/oleaut32/typelib.c | 100 +++++++++++++++++++++++++---------------------- 1 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index efe1720..c61bd36 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2884,47 +2884,14 @@ static void SLTG_DoVars(char *pBlk, ITyp pTI->TypeAttr.cVars = cVars; } -static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, - char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, - SLTG_TypeInfoTail *pTITail) -{ - char *pFirstItem, *pNextItem; - - if(pTIHeader->href_table != 0xffffffff) { - SLTG_DoRefs((SLTG_RefInfo*)((char *)pTIHeader + pTIHeader->href_table), pTI, - pNameTable); - } - - pFirstItem = pNextItem = pBlk; - - if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { - pNextItem = SLTG_DoImpls(pFirstItem, pTI, FALSE); - } -} - - -static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, - char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, - SLTG_TypeInfoTail *pTITail) +static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short cFuncs, char *pNameTable) { SLTG_Function *pFunc; - char *pFirstItem, *pNextItem; + unsigned short i; TLBFuncDesc **ppFuncDesc = &pTI->funclist; - int num = 0; - - if(pTIHeader->href_table != 0xffffffff) { - SLTG_DoRefs((SLTG_RefInfo*)((char *)pTIHeader + pTIHeader->href_table), pTI, - pNameTable); - } - pFirstItem = pNextItem = pBlk; - - if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { - pNextItem = SLTG_DoImpls(pFirstItem, pTI, TRUE); - } - - for(pFunc = (SLTG_Function*)pNextItem, num = 1; 1; - pFunc = (SLTG_Function*)(pFirstItem + pFunc->next), num++) { + for(pFunc = (SLTG_Function*)pFirstItem, i = 0; i < cFuncs; + pFunc = (SLTG_Function*)(pBlk + pFunc->next), i++) { int param; WORD *pType, *pArg; @@ -2951,10 +2918,9 @@ static void SLTG_ProcessInterface(char * if(pFunc->retnextopt & 0x80) pType = &pFunc->rettype; else - pType = (WORD*)(pFirstItem + pFunc->rettype); - + pType = (WORD*)(pBlk + pFunc->rettype); - SLTG_DoElem(pType, pFirstItem, &(*ppFuncDesc)->funcdesc.elemdescFunc); + SLTG_DoElem(pType, pBlk, &(*ppFuncDesc)->funcdesc.elemdescFunc); (*ppFuncDesc)->funcdesc.lprgelemdescParam = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -2963,7 +2929,7 @@ static void SLTG_ProcessInterface(char * HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (*ppFuncDesc)->funcdesc.cParams * sizeof(TLBParDesc)); - pArg = (WORD*)(pFirstItem + pFunc->arg_off); + pArg = (WORD*)(pBlk + pFunc->arg_off); for(param = 0; param < (*ppFuncDesc)->funcdesc.cParams; param++) { char *paramName = pNameTable + *pArg; @@ -2990,14 +2956,14 @@ static void SLTG_ProcessInterface(char * pArg++; if(HaveOffs) { /* the next word is an offset to type */ - pType = (WORD*)(pFirstItem + *pArg); - SLTG_DoElem(pType, pFirstItem, + pType = (WORD*)(pBlk + *pArg); + SLTG_DoElem(pType, pBlk, &(*ppFuncDesc)->funcdesc.lprgelemdescParam[param]); pArg++; } else { if(paramName) paramName--; - pArg = SLTG_DoElem(pArg, pFirstItem, + pArg = SLTG_DoElem(pArg, pBlk, &(*ppFuncDesc)->funcdesc.lprgelemdescParam[param]); } @@ -3015,7 +2981,48 @@ static void SLTG_ProcessInterface(char * ppFuncDesc = &((*ppFuncDesc)->next); if(pFunc->next == 0xffff) break; } - pTI->TypeAttr.cFuncs = num; + pTI->TypeAttr.cFuncs = cFuncs; +} + +static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, + char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, + SLTG_TypeInfoTail *pTITail) +{ + char *pFirstItem, *pNextItem; + + if(pTIHeader->href_table != 0xffffffff) { + SLTG_DoRefs((SLTG_RefInfo*)((char *)pTIHeader + pTIHeader->href_table), pTI, + pNameTable); + } + + pFirstItem = pNextItem = pBlk; + + if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { + pNextItem = SLTG_DoImpls(pFirstItem, pTI, FALSE); + } +} + + +static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, + char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, + SLTG_TypeInfoTail *pTITail) +{ + char *pFirstItem, *pNextItem; + + if(pTIHeader->href_table != 0xffffffff) { + SLTG_DoRefs((SLTG_RefInfo*)((char *)pTIHeader + pTIHeader->href_table), pTI, + pNameTable); + } + + pFirstItem = pNextItem = pBlk; + + if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { + pNextItem = SLTG_DoImpls(pFirstItem, pTI, TRUE); + } + + if (pTITail->funcs_off != 0xffff) + SLTG_DoFuncs(pBlk, pBlk + pTITail->funcs_off, pTI, pTITail->cFuncs, pNameTable); + if (TRACE_ON(typelib)) dump_TLBFuncDesc(pTI->funclist); } @@ -3061,7 +3068,8 @@ static void SLTG_ProcessDispatch(char *p if (pTITail->vars_off != 0xffff) SLTG_DoVars(pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable); - FIXME_(typelib)("process funcs\n"); + if (pTITail->funcs_off != 0xffff) + SLTG_DoFuncs(pBlk, pBlk + pTITail->funcs_off, pTI, pTITail->cFuncs, pNameTable); } static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI,

1 0

Robert Shearman : oleaut: Rename SLTG_DoType to SLTG_DoElem and split out the common TYPEDESC generating code to SLTG_DoType .
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 23e089a09fba1f05b4c33dbbbf90f64c5ac01f51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=23e089a09fba1f05b4c33db… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:53:52 2006 +0100 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. --- dlls/oleaut32/typelib.c | 76 +++++++++++++++++++---------------------------- dlls/oleaut32/typelib.h | 8 ----- 2 files changed, 31 insertions(+), 53 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a72bff5..61a8266 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2635,26 +2635,9 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLib 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; - 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) { if((*pType & 0xe00) == 0xe00) { @@ -2718,6 +2701,27 @@ static WORD *SLTG_DoType(WORD *pType, ch 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, char *pNameTable) @@ -2889,7 +2893,7 @@ static void SLTG_ProcessInterface(char * pType = (WORD*)(pFirstItem + pFunc->rettype); - SLTG_DoType(pType, pFirstItem, &(*ppFuncDesc)->funcdesc.elemdescFunc); + SLTG_DoElem(pType, pFirstItem, &(*ppFuncDesc)->funcdesc.elemdescFunc); (*ppFuncDesc)->funcdesc.lprgelemdescParam = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -2926,13 +2930,13 @@ static void SLTG_ProcessInterface(char * if(HaveOffs) { /* the next word is an offset to type */ pType = (WORD*)(pFirstItem + *pArg); - SLTG_DoType(pType, pFirstItem, + SLTG_DoElem(pType, pFirstItem, &(*ppFuncDesc)->funcdesc.lprgelemdescParam[param]); pArg++; } else { if(paramName) paramName--; - pArg = SLTG_DoType(pArg, pFirstItem, + pArg = SLTG_DoElem(pArg, pFirstItem, &(*ppFuncDesc)->funcdesc.lprgelemdescParam[param]); } @@ -2989,7 +2993,7 @@ static void SLTG_ProcessRecord(char *pBl break; } - SLTG_DoType(pType, pFirstItem, + SLTG_DoElem(pType, pFirstItem, &(*ppVarDesc)->vardesc.elemdescVar); /* FIXME("helpcontext, helpstring\n"); */ @@ -3006,8 +3010,7 @@ static void SLTG_ProcessAlias(char *pBlk char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { - SLTG_AliasItem *pItem; - TYPEDESC *tdesc = &pTI->TypeAttr.tdescAlias; + WORD *pType; if (pTITail->simple_alias) { /* if simple alias, no more processing required */ @@ -3015,27 +3018,10 @@ static void SLTG_ProcessAlias(char *pBlk return; } - /* otherwise it is an offset */ - pItem = (SLTG_AliasItem *)(pBlk + pTITail->tdescalias_vt); - - /* This is used for creating a TYPEDESC chain in case of VT_USERDEFINED */ - 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; - } - } + /* otherwise it is an offset to a type */ + pType = (WORD *)(pBlk + pTITail->tdescalias_vt); + + SLTG_DoType(pType, pBlk, &pTI->TypeAttr.tdescAlias); } static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI, diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index ca0fb26..9c91011 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -477,14 +477,6 @@ typedef struct { #define SLTG_ENUMITEM_MAGIC 0x120a 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 inv; /* high nibble is INVOKE_KIND, low nibble = 2 */ WORD next; /* byte offset from beginning of group to next fn */

1 0

Robert Shearman : oleaut: Process references when parsing SLTG alias types.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: bc6acf5c1ded5d8532c7d6fa07608b6faf77c671 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc6acf5c1ded5d8532c7d6f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:53:57 2006 +0100 oleaut: Process references when parsing SLTG alias types. --- dlls/oleaut32/typelib.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 61a8266..c049b18 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3018,6 +3018,11 @@ static void SLTG_ProcessAlias(char *pBlk return; } + if(pTIHeader->href_table != 0xffffffff) { + SLTG_DoRefs((SLTG_RefInfo*)((char *)pTIHeader + pTIHeader->href_table), pTI, + pNameTable); + } + /* otherwise it is an offset to a type */ pType = (WORD *)(pBlk + pTITail->tdescalias_vt);

1 0

Robert Shearman : oleaut: Abstract out the processing of variables in SLTG typelib components to a common function .
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: e4188e8846ef6fe134f64ebd19d32c42a7c2b416 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4188e8846ef6fe134f64eb… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:54:01 2006 +0100 oleaut: Abstract out the processing of variables in SLTG typelib components to a common function. --- dlls/oleaut32/typelib.c | 145 +++++++++++++++++++++++------------------------ dlls/oleaut32/typelib.h | 10 ++- 2 files changed, 77 insertions(+), 78 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c049b18..aff6c24 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2646,7 +2646,7 @@ static WORD *SLTG_DoType(WORD *pType, ch sizeof(TYPEDESC)); pTD = pTD->u.lptdesc; } - switch(*pType & 0x7f) { + switch(*pType & 0x3f) { case VT_PTR: pTD->vt = VT_PTR; pTD->u.lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -2692,7 +2692,7 @@ static WORD *SLTG_DoType(WORD *pType, ch break; } default: - pTD->vt = *pType & 0x7f; + pTD->vt = *pType & 0x3f; done = TRUE; break; } @@ -2823,6 +2823,70 @@ static char *SLTG_DoImpls(char *pBlk, IT 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, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) @@ -2963,47 +3027,7 @@ static void SLTG_ProcessRecord(char *pBl char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { - SLTG_RecordItem *pItem; - 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; + SLTG_DoVars(pBlk, pTI, pTITail->cVars, pNameTable); } static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI, @@ -3033,42 +3057,17 @@ static void SLTG_ProcessDispatch(char *p char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, 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, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { - SLTG_EnumItem *pItem; - 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; + SLTG_DoVars(pBlk, pTI, pTITail->cVars, pNameTable); } /* Because SLTG_OtherTypeInfo is such a painful struct, we make a more diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 9c91011..8ebe1ee 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -571,17 +571,17 @@ #define SLTG_IMPL_MAGIC 0x004a typedef struct { BYTE magic; /* 0x0a */ - BYTE typepos; + BYTE flags; WORD next; WORD name; - WORD byte_offs; /* pos in struct */ - WORD type; /* if typepos == 0x02 this is the type, else offset to type */ + WORD byte_offs; /* pos in struct, or offset to const type */ + WORD type; /* if flags & 0x02 this is the type, else offset to type */ DWORD memid; WORD helpcontext; /* ?? */ WORD helpstring; /* ?? */ -} SLTG_RecordItem; +} SLTG_Variable; -#define SLTG_RECORD_MAGIC 0x0a +#define SLTG_VAR_MAGIC 0x0a /* CARRAYs look like this

1 0

Robert Shearman : oleaut: Process references for SLTG dispatch types.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 92b468e810f4350572c5bafe92b6f397661e1b41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92b468e810f4350572c5baf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:54:16 2006 +0100 oleaut: Process references for SLTG dispatch types. --- dlls/oleaut32/typelib.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index aff6c24..35dd770 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3057,10 +3057,14 @@ static void SLTG_ProcessDispatch(char *p char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { + if (pTIHeader->href_table != 0xffffffff) + SLTG_DoRefs((SLTG_RefInfo*)((char *)pTIHeader + pTIHeader->href_table), pTI, + pNameTable); + if (pTITail->vars_off != 0xffff) SLTG_DoVars(pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable); - FIXME_(typelib)("process refs and funcs\n"); + FIXME_(typelib)("process funcs\n"); } static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI,

1 0

Dmitry Timoshkov : winex11.drv: Update Lithuanian keyboard layout to better match the X11 one.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: e7e6f10997cf919fbe611905203a45d1d73145a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7e6f10997cf919fbe61190… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jul 4 13:57:48 2006 +0900 winex11.drv: Update Lithuanian keyboard layout to better match the X11 one. --- dlls/winex11.drv/keyboard.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 459101b..d9a1bf3 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -771,13 +771,14 @@ static const char main_key_LA[MAIN_LEN][ "<>" }; -/*** Lithuanian (Baltic) keyboard layout (pc/lt in XFree86 4.3.0, contributed by Nerijus Bali�nas) */ +/*** Lithuanian keyboard layout (setxkbmap lt) */ static const char main_key_LT_B[MAIN_LEN][4] = { "`~","��","��","��","��","��","��","��","��","�(","�)","-_","��","\\|", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"", - "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?" + "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", + "��" }; /*** Turkish keyboard Layout */

1 0

Huw Davies : rpcrt4: Don't advance the buffer for FC_STRUCTPAD2.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 85ed9a59056da85751ecb688ffcd18c5e2291017 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85ed9a59056da85751ecb68… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 3 21:52:48 2006 +0100 rpcrt4: Don't advance the buffer for FC_STRUCTPAD2. --- dlls/rpcrt4/ndr_marshall.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 92c2f7a..6e51eaf 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2002,7 +2002,6 @@ static unsigned long ComplexStructMemory break; case RPC_FC_STRUCTPAD2: size += 2; - pStubMsg->Buffer += 2; break; case RPC_FC_EMBEDDED_COMPLEX: size += pFormat[1];

1 0

Robert Shearman : advapi32: Fix the service function being called when extended is
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: cc5aceb4f0a0de8cd07b15b1181f86dbcdf66a82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc5aceb4f0a0de8cd07b15b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:49:10 2006 +0100 advapi32: Fix the service function being called when extended is either set or not set (reported by Andrey Turkin). --- dlls/advapi32/service.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2ceb8a2..10b3c67 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -610,14 +610,14 @@ static BOOL service_handle_control(HANDL if (service_accepts_control(service, dwControl)) { - if (service->extended && service->handler.handler) + if (service->extended && service->handler.handler_ex) { - service->handler.handler(dwControl); + service->handler.handler_ex(dwControl, 0, NULL, service->context); ret = ERROR_SUCCESS; } - else if (service->handler.handler_ex) + else if (service->handler.handler) { - service->handler.handler_ex(dwControl, 0, NULL, service->context); + service->handler.handler(dwControl); ret = ERROR_SUCCESS; } }

1 0

Robert Shearman : oleaut: Document some more members of SLTG_TypeInfoTail.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 283049b8fce7fe744a62f0106b8369a6149ae61e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=283049b8fce7fe744a62f01… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:53:44 2006 +0100 oleaut: Document some more members of SLTG_TypeInfoTail. --- dlls/oleaut32/typelib.c | 6 ------ dlls/oleaut32/typelib.h | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 71dec16..425435c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3379,12 +3379,6 @@ static ITypeLib2* ITypeLib2_Constructor_ #define X(x) TRACE_(typelib)("tt "#x": %x\n",pTITail->res##x); X(06); - X(08); - X(0a); - X(0c); - X(0e); - X(10); - X(12); X(16); X(18); X(1a); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 2ab2ebc..7598630 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -428,28 +428,28 @@ typedef struct { /*00*/ WORD cFuncs; /*02*/ WORD cVars; /*04*/ WORD cImplTypes; -/*06*/ WORD res06; -/*08*/ WORD res08; -/*0a*/ WORD res0a; -/*0c*/ WORD res0c; -/*0e*/ WORD res0e; -/*10*/ WORD res10; -/*12*/ WORD res12; +/*06*/ WORD res06; /* always 0000 */ +/*08*/ WORD funcs_off; /* offset to functions (starting from the member header) */ +/*0a*/ WORD vars_off; /* offset to vars (starting from the member header) */ +/*0c*/ WORD impls_off; /* offset to implemented types (starting from the member header) */ +/*0e*/ WORD funcs_bytes; /* bytes used by function data */ +/*10*/ WORD vars_bytes; /* bytes used by var data */ +/*12*/ WORD impls_bytes; /* bytes used by implemented type data */ /*14*/ WORD tdescalias_vt; /* for TKIND_ALIAS */ -/*16*/ WORD res16; -/*18*/ WORD res18; -/*1a*/ WORD res1a; +/*16*/ WORD res16; /* always ffff */ +/*18*/ WORD res18; /* always 0000 */ +/*1a*/ WORD res1a; /* always 0000 */ /*1c*/ WORD res1c; -/*1e*/ WORD res1e; +/*1e*/ WORD res1e; /* always 0000 */ /*20*/ WORD cbSizeInstance; /*22*/ WORD cbAlignment; /*24*/ WORD res24; /*26*/ WORD res26; /*28*/ WORD cbSizeVft; -/*2a*/ WORD res2a; -/*2c*/ WORD res2c; -/*2e*/ WORD res2e; -/*30*/ WORD res30; +/*2a*/ WORD res2a; /* always ffff */ +/*2c*/ WORD res2c; /* always ffff */ +/*2e*/ WORD res2e; /* always ffff */ +/*30*/ WORD res30; /* always ffff */ /*32*/ WORD res32; /*34*/ WORD res34; } SLTG_TypeInfoTail;

1 0