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

Bang Jun-Young : cryptnet: Add .gitignore.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 67fcd2f1ea68ab2842d0ee59cb4516694c884dbc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67fcd2f1ea68ab2842d0ee5… Author: Bang Jun-Young <bang.junyoung(a)gmail.com> Date: Sun Jul 2 17:50:22 2006 +0900 cryptnet: Add .gitignore. --- dlls/cryptnet/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 dlls/cryptnet/.gitignore diff --git a/dlls/cryptnet/.gitignore b/dlls/cryptnet/.gitignore new file mode 100644 index 0000000..f3c7a7c --- /dev/null +++ b/dlls/cryptnet/.gitignore @@ -0,0 +1 @@ +Makefile

1 0

Andrew Talbot : user/tests: Write-strings warnings fix.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 7591285502bac94ac8dd78dc5c8f1fd392c6301f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7591285502bac94ac8dd78d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Jul 2 14:35:20 2006 +0100 user/tests: Write-strings warnings fix. --- dlls/user/tests/menu.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index 01b113b..3dadbb3 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -530,15 +530,15 @@ static void test_menu_add_string( void ) char strback[0x80]; WCHAR strbackW[0x80]; - static const WCHAR expectedString[] = {'D', 'u', 'm', 'm', 'y', ' ', - 's', 't', 'r', 'i', 'n', 'g', 0}; + static CHAR blah[] = "blah"; + static const WCHAR expectedString[] = {'D','u','m','m','y',' ','s','t','r','i','n','g', 0}; hmenu = CreateMenu(); memset( &info, 0, sizeof info ); info.cbSize = sizeof info; info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_ID; - info.dwTypeData = "blah"; + info.dwTypeData = blah; info.cch = 6; info.dwItemData = 0; info.wID = 1; @@ -1179,6 +1179,8 @@ void test_menu_search_bycommand( void ) UINT id; char strback[0x80]; char strIn[0x80]; + static CHAR menuitem[] = "MenuItem", + menuitem2[] = "MenuItem 2"; /* Case 1: Menu containing a menu item */ hmenu = CreateMenu(); @@ -1322,15 +1324,15 @@ void test_menu_search_bycommand( void ) Case 3: Menu containing a popup menu which in turn contains 2 items with the same id as the popup itself */ - + hmenu = CreateMenu(); hmenuSub = CreateMenu(); - + memset( &info, 0, sizeof info ); info.cbSize = sizeof info; info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID; info.fType = MFT_STRING; - info.dwTypeData = "MenuItem"; + info.dwTypeData = menuitem; info.wID = (UINT_PTR) hmenuSub; /* Enforce id collisions with the hmenu of the popup submenu*/ rc = InsertMenu(hmenu, 0, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuSub, "Submenu"); @@ -1343,9 +1345,9 @@ void test_menu_search_bycommand( void ) info.cbSize = sizeof info; info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID; info.fType = MFT_STRING; - info.dwTypeData = "MenuItem 2"; + info.dwTypeData = menuitem2; info.wID = (UINT_PTR) hmenuSub; /* Enforce id collisions with the hmenu of the popup submenu*/ - + rc = InsertMenuItem(hmenuSub, 1, TRUE, &info ); ok (rc, "Inserting the sub menu menuitem 2 failed\n"); @@ -1386,9 +1388,9 @@ void test_menu_search_bycommand( void ) info.cbSize = sizeof info; info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID; info.fType = MFT_STRING; - info.dwTypeData = "MenuItem"; + info.dwTypeData = menuitem; info.wID = (UINT_PTR) hmenuSub; /* Enforce id collisions with the hmenu of the popup submenu*/ - + rc = InsertMenuItem(hmenuSub2, 0, TRUE, &info ); ok (rc, "Inserting the sub menu menuitem failed\n"); @@ -1396,9 +1398,9 @@ void test_menu_search_bycommand( void ) info.cbSize = sizeof info; info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID; info.fType = MFT_STRING; - info.dwTypeData = "MenuItem 2"; + info.dwTypeData = menuitem2; info.wID = (UINT_PTR) hmenuSub; /* Enforce id collisions with the hmenu of the popup submenu*/ - + rc = InsertMenuItem(hmenuSub2, 1, TRUE, &info ); ok (rc, "Inserting the sub menu menuitem 2 failed\n");

1 0

Andrew Talbot : mapi32: Write-strings warnings fix.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 24dcc8d3cc2e860943f0f502112e5e40caf01201 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24dcc8d3cc2e860943f0f50… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jul 3 21:23:15 2006 +0100 mapi32: Write-strings warnings fix. --- dlls/mapi32/sendmail.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 5681c97..e2c41d0 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -63,7 +63,8 @@ ULONG WINAPI MAPISendMail( LHANDLE sessi unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; - char *address = "", *to = NULL, *cc = NULL, *bcc = NULL, *subject, *body; + char *to = NULL, *cc = NULL, *bcc = NULL; + const char *address, *subject, *body; static const char format[] = "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; char *mailto = NULL, *escape = NULL;

1 0

Paul Vriens : wininet.h: Add extra error code.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 57d0810aa558e2a1ed558fc5ed5f18f00128b90d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57d0810aa558e2a1ed558fc… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Jul 4 16:26:47 2006 +0200 wininet.h: Add extra error code. --- include/wininet.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index a6957d2..14daf5f 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1376,7 +1376,8 @@ #define ERROR_INTERNET_UNABLE_TO_DOWNLOA #define ERROR_INTERNET_SEC_INVALID_CERT (INTERNET_ERROR_BASE + 169) #define ERROR_INTERNET_SEC_CERT_REVOKED (INTERNET_ERROR_BASE + 170) #define ERROR_INTERNET_FAILED_DUETOSECURITYCHECK (INTERNET_ERROR_BASE + 171) -#define INTERNET_ERROR_LAST ERROR_INTERNET_FAILED_DUETOSECURITYCHECK +#define ERROR_INTERNET_NOT_INITIALIZED (INTERNET_ERROR_BASE + 172) +#define INTERNET_ERROR_LAST ERROR_INTERNET_NOT_INITIALIZED #define NORMAL_CACHE_ENTRY 0x00000001

1 0

Robert Reif : dxdiagn: Fix TRACE/FIXME formats.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 8d99e2e79c9f50521ab512451475b7dfbc92e8a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d99e2e79c9f50521ab5124… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jul 4 09:59:53 2006 -0400 dxdiagn: Fix TRACE/FIXME formats. --- dlls/dxdiagn/dxdiag_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index f902415..2279e0c 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -112,7 +112,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI { int i = 0; - TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); while (NULL != DXDiag_CFS[i].rclsid) { if (IsEqualGUID(rclsid, DXDiag_CFS[i].rclsid)) { DXDiagCF_AddRef((IClassFactory*) &DXDiag_CFS[i]); @@ -122,6 +122,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSI ++i; } - FIXME("(%p,%p,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Mikołaj Zalewski : comctl32: listview: Recompute header size after an insertion of a column.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 22482171572ab1e1bf9092e237a620eaf7b32e69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22482171572ab1e1bf9092e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Jul 3 22:09:19 2006 +0200 comctl32: listview: Recompute header size after an insertion of a column. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9adf764..fb4ecf6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6593,6 +6593,7 @@ static INT LISTVIEW_InsertColumnT(LISTVI /* make space for the new column */ LISTVIEW_ScrollColumns(infoPtr, nNewColumn + 1, lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left); + LISTVIEW_UpdateItemSize(infoPtr); return nNewColumn;

1 0

Paul Vriens : ntdll: Fix possible TRACE crash.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 2e3e74ebd0a9f7860db823582020cd5813559d5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e3e74ebd0a9f7860db8235… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Jul 3 14:20:40 2006 +0200 ntdll: Fix possible TRACE crash. --- dlls/ntdll/reg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 5a1f5c2..e77c48a 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -55,13 +55,13 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE ret { NTSTATUS ret; - TRACE( "(%p,%s,%s,%lx,%lx,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), - debugstr_us(class), options, access, retkey ); - if (!retkey || !attr) return STATUS_ACCESS_VIOLATION; if (attr->Length > sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER; if (attr->ObjectName->Length > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW; + TRACE( "(%p,%s,%s,%lx,%lx,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), + debugstr_us(class), options, access, retkey ); + SERVER_START_REQ( create_key ) { req->parent = attr->RootDirectory;

1 0

Robert Shearman : oleaut: Implement processing of modules for SLTG typelibs .
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 65639ab7221637a01e2d0b88ecdebc5f1c92284b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65639ab7221637a01e2d0b8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:54:50 2006 +0100 oleaut: Implement processing of modules for SLTG typelibs. Set funckind when processing SLTG functions. --- dlls/oleaut32/typelib.c | 45 ++++++++++++++++++++++++++++++++++++++------- dlls/oleaut32/typelib.h | 7 ++++--- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5554205..8483aa9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2906,14 +2906,25 @@ static void SLTG_DoFuncs(char *pBlk, cha int param; WORD *pType, *pArg; - if(pFunc->magic != SLTG_FUNCTION_MAGIC && - pFunc->magic != SLTG_FUNCTION_WITH_FLAGS_MAGIC && - pFunc->magic != SLTG_DISPATCH_FUNCTION_MAGIC) { - FIXME("func magic = %02x\n", pFunc->magic); - return; - } *ppFuncDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**ppFuncDesc)); + + switch (pFunc->magic & ~SLTG_FUNCTION_FLAGS_PRESENT) { + case SLTG_FUNCTION_MAGIC: + (*ppFuncDesc)->funcdesc.funckind = FUNC_PUREVIRTUAL; + break; + case SLTG_DISPATCH_FUNCTION_MAGIC: + (*ppFuncDesc)->funcdesc.funckind = FUNC_DISPATCH; + break; + case SLTG_STATIC_FUNCTION_MAGIC: + (*ppFuncDesc)->funcdesc.funckind = FUNC_STATIC; + break; + default: + FIXME("unimplemented func magic = %02x\n", pFunc->magic & ~SLTG_FUNCTION_FLAGS_PRESENT); + HeapFree(GetProcessHeap(), 0, *ppFuncDesc); + *ppFuncDesc = NULL; + return; + } (*ppFuncDesc)->Name = TLB_MultiByteToBSTR(pFunc->name + pNameTable); (*ppFuncDesc)->funcdesc.memid = pFunc->dispid; @@ -2923,7 +2934,7 @@ static void SLTG_DoFuncs(char *pBlk, cha (*ppFuncDesc)->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; (*ppFuncDesc)->funcdesc.oVft = pFunc->vtblpos; - if(pFunc->magic == SLTG_FUNCTION_WITH_FLAGS_MAGIC) + if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) (*ppFuncDesc)->funcdesc.wFuncFlags = pFunc->funcflags; if(pFunc->retnextopt & 0x80) @@ -3098,6 +3109,21 @@ static void SLTG_ProcessEnum(char *pBlk, SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable); } +static void SLTG_ProcessModule(char *pBlk, ITypeInfoImpl *pTI, + 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, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable); + + if (pTITail->funcs_off != 0xffff) + SLTG_DoFuncs(pBlk, pBlk + pTITail->funcs_off, pTI, pTITail->cFuncs, pNameTable); +} + /* Because SLTG_OtherTypeInfo is such a painful struct, we make a more managable copy of it into this */ typedef struct { @@ -3371,6 +3397,11 @@ static ITypeLib2* ITypeLib2_Constructor_ pTIHeader, pTITail); break; + case TKIND_MODULE: + SLTG_ProcessModule((char *)(pMemHeader + 1), *ppTypeInfoImpl, pNameTable, + pTIHeader, pTITail); + break; + default: FIXME("Not processing typekind %d\n", pTIHeader->typekind); break; diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index e774800..be2e3eb 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -477,7 +477,7 @@ typedef struct { #define SLTG_ENUMITEM_MAGIC 0x120a typedef struct { - BYTE magic; /* 0x4c or 0x6c */ + BYTE magic; /* 0x4c, 0xcb or 0x8b with optional SLTG_FUNCTION_FLAGS_PRESENT flag */ BYTE inv; /* high nibble is INVOKE_KIND, low nibble = 2 */ WORD next; /* byte offset from beginning of group to next fn */ WORD name; /* Offset within name table to name */ @@ -491,7 +491,7 @@ typedef struct { middle 6 bits */ WORD rettype; /* return type VT_?? or offset to ret type */ WORD vtblpos; /* position in vtbl? */ - WORD funcflags; /* present if magic == 0x6c */ + WORD funcflags; /* present if magic & 0x20 */ /* Param list starts, repeat next two as required */ #if 0 WORD name; /* offset to 2nd letter of name */ @@ -499,9 +499,10 @@ #if 0 #endif } SLTG_Function; +#define SLTG_FUNCTION_FLAGS_PRESENT 0x20 #define SLTG_FUNCTION_MAGIC 0x4c -#define SLTG_FUNCTION_WITH_FLAGS_MAGIC 0x6c #define SLTG_DISPATCH_FUNCTION_MAGIC 0xcb +#define SLTG_STATIC_FUNCTION_MAGIC 0x8b typedef struct { /*00*/ BYTE magic; /* 0xdf */

1 0

Robert Shearman : oleaut: Improve SLTG var support.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 3f97460c2b702eb6d34a707bd62b26c624a1b28f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f97460c2b702eb6d34a707… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:54:38 2006 +0100 oleaut: Improve SLTG var support. Pass both the start of the block and the offset to the first item into SLTG_DoVars as they may be different. Process 0xfffe offsets for variable names - this means to use the previous name. Add support for parsing the optional varflags field. --- dlls/oleaut32/typelib.c | 24 +++++++++++++++++------- dlls/oleaut32/typelib.h | 2 ++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d65fd64..5554205 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2820,27 +2820,33 @@ static char *SLTG_DoImpls(char *pBlk, IT return (char*)info; } -static void SLTG_DoVars(char *pBlk, ITypeInfoImpl *pTI, unsigned short cVars, char *pNameTable) +static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short cVars, char *pNameTable) { TLBVarDesc **ppVarDesc = &pTI->varlist; + BSTR bstrPrevName = NULL; SLTG_Variable *pItem; unsigned short i; WORD *pType; char buf[300]; - for(pItem = (SLTG_Variable *)pBlk, i = 0; i < cVars; + for(pItem = (SLTG_Variable *)pFirstItem, 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) { + if (pItem->magic != SLTG_VAR_MAGIC && + pItem->magic != SLTG_VAR_WITH_FLAGS_MAGIC) { FIXME_(typelib)("var magic = %02x\n", pItem->magic); return; } + if (pItem->name == 0xfffe) + (*ppVarDesc)->Name = SysAllocString(bstrPrevName); + else + (*ppVarDesc)->Name = TLB_MultiByteToBSTR(pItem->name + pNameTable); + TRACE_(typelib)("byte_offs = 0x%x\n", pItem->byte_offs); TRACE_(typelib)("memid = 0x%lx\n", pItem->memid); @@ -2863,6 +2869,9 @@ static void SLTG_DoVars(char *pBlk, ITyp (*ppVarDesc)->vardesc.varkind = VAR_PERINSTANCE; } + if (pItem->magic == SLTG_VAR_WITH_FLAGS_MAGIC) + (*ppVarDesc)->vardesc.wVarFlags = pItem->varflags; + if (pItem->flags & 0x80) (*ppVarDesc)->vardesc.wVarFlags |= VARFLAG_FREADONLY; @@ -2879,6 +2888,7 @@ static void SLTG_DoVars(char *pBlk, ITyp dump_TypeDesc(&(*ppVarDesc)->vardesc.elemdescVar.tdesc, buf); + bstrPrevName = (*ppVarDesc)->Name; ppVarDesc = &((*ppVarDesc)->next); } pTI->TypeAttr.cVars = cVars; @@ -3032,7 +3042,7 @@ static void SLTG_ProcessRecord(char *pBl char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { - SLTG_DoVars(pBlk, pTI, pTITail->cVars, pNameTable); + SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable); } static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI, @@ -3067,7 +3077,7 @@ static void SLTG_ProcessDispatch(char *p pNameTable); if (pTITail->vars_off != 0xffff) - SLTG_DoVars(pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable); + SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable); if (pTITail->funcs_off != 0xffff) SLTG_DoFuncs(pBlk, pBlk + pTITail->funcs_off, pTI, pTITail->cFuncs, pNameTable); @@ -3085,7 +3095,7 @@ static void SLTG_ProcessEnum(char *pBlk, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { - SLTG_DoVars(pBlk, pTI, pTITail->cVars, pNameTable); + SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, 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 4ac98ad..e774800 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -580,9 +580,11 @@ typedef struct { DWORD memid; WORD helpcontext; /* ?? */ WORD helpstring; /* ?? */ + WORD varflags; /* only present if magic & 0x02 */ } SLTG_Variable; #define SLTG_VAR_MAGIC 0x0a +#define SLTG_VAR_WITH_FLAGS_MAGIC 0x2a /* CARRAYs look like this

1 0

Robert Shearman : oleaut: Fix function support for SLTG dispinterfaces.
by Alexandre Julliard July 6, 2006

July 6, 2006

Module: wine Branch: refs/heads/master Commit: 4b6b51ae99eb372b38143e58eaee16035d65f7d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b6b51ae99eb372b38143e5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 3 13:54:34 2006 +0100 oleaut: Fix function support for SLTG dispinterfaces. --- dlls/oleaut32/typelib.c | 19 ++++++++++++++----- dlls/oleaut32/typelib.h | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c61bd36..d65fd64 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2897,7 +2897,8 @@ static void SLTG_DoFuncs(char *pBlk, cha WORD *pType, *pArg; if(pFunc->magic != SLTG_FUNCTION_MAGIC && - pFunc->magic != SLTG_FUNCTION_WITH_FLAGS_MAGIC) { + pFunc->magic != SLTG_FUNCTION_WITH_FLAGS_MAGIC && + pFunc->magic != SLTG_DISPATCH_FUNCTION_MAGIC) { FIXME("func magic = %02x\n", pFunc->magic); return; } @@ -3070,6 +3071,14 @@ static void SLTG_ProcessDispatch(char *p if (pTITail->funcs_off != 0xffff) SLTG_DoFuncs(pBlk, pBlk + pTITail->funcs_off, pTI, pTITail->cFuncs, pNameTable); + + /* this is necessary to cope with MSFT typelibs that set cFuncs to the number + * of dispinterface functons including the IDispatch ones, so + * ITypeInfo::GetFuncDesc takes the real value for cFuncs from cbSizeVft */ + pTI->TypeAttr.cbSizeVft = pTI->TypeAttr.cFuncs * sizeof(void *); + + if (TRACE_ON(typelib)) + dump_TLBFuncDesc(pTI->funclist); } static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI, @@ -3317,6 +3326,10 @@ static ITypeLib2* ITypeLib2_Constructor_ pTITail = (SLTG_TypeInfoTail*)((char *)(pMemHeader + 1) + pMemHeader->cbExtra); + (*ppTypeInfoImpl)->TypeAttr.cbAlignment = pTITail->cbAlignment; + (*ppTypeInfoImpl)->TypeAttr.cbSizeInstance = pTITail->cbSizeInstance; + (*ppTypeInfoImpl)->TypeAttr.cbSizeVft = pTITail->cbSizeVft; + switch(pTIHeader->typekind) { case TKIND_ENUM: SLTG_ProcessEnum((char *)(pMemHeader + 1), *ppTypeInfoImpl, pNameTable, @@ -3356,10 +3369,6 @@ static ITypeLib2* ITypeLib2_Constructor_ if(pTITail) { /* could get cFuncs, cVars and cImplTypes from here but we've already set those */ - (*ppTypeInfoImpl)->TypeAttr.cbAlignment = pTITail->cbAlignment; - (*ppTypeInfoImpl)->TypeAttr.cbSizeInstance = pTITail->cbSizeInstance; - (*ppTypeInfoImpl)->TypeAttr.cbSizeVft = pTITail->cbSizeVft; - #define X(x) TRACE_(typelib)("tt "#x": %x\n",pTITail->res##x); X(06); X(16); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 8ebe1ee..4ac98ad 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -501,6 +501,7 @@ #endif #define SLTG_FUNCTION_MAGIC 0x4c #define SLTG_FUNCTION_WITH_FLAGS_MAGIC 0x6c +#define SLTG_DISPATCH_FUNCTION_MAGIC 0xcb typedef struct { /*00*/ BYTE magic; /* 0xdf */

1 0