March 2010 - Wine-commits - list.winehq.org

Ričardas Barkauskas : d3d9/tests: Test ATI2N pitch and locking offset behaviour.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 1e754f5e2e7db698e9b2c8f0133214f2d3959f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e754f5e2e7db698e9b2c8f01… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Tue Mar 16 01:10:09 2010 +0200 d3d9/tests: Test ATI2N pitch and locking offset behaviour. --- dlls/d3d9/tests/surface.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 396e0c4..4427cc0 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -187,8 +187,10 @@ todo_wine ok(SUCCEEDED(hr), "Double IDirect3DTexture9_UnLockRect failed with % static void test_lockrect_offset(IDirect3DDevice9 *device) { IDirect3DSurface9 *surface = 0; + IDirect3D9 *d3d; const RECT rect = {60, 60, 68, 68}; D3DLOCKED_RECT locked_rect; + int expected_pitch; unsigned int expected_offset; unsigned int offset; unsigned int i; @@ -202,14 +204,24 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) unsigned int block_height; unsigned int block_size; } dxt_formats[] = { - {D3DFMT_DXT1, "D3DFMT_DXT1", 4, 4, 8}, - {D3DFMT_DXT2, "D3DFMT_DXT2", 4, 4, 16}, - {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, 16}, - {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, 16}, - {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 16}, + {D3DFMT_DXT1, "D3DFMT_DXT1", 4, 4, 8}, + {D3DFMT_DXT2, "D3DFMT_DXT2", 4, 4, 16}, + {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, 16}, + {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, 16}, + {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 16}, + {MAKEFOURCC('A','T','I','2'), "ATI2N", 1, 1, 1}, }; + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "IDirect3DDevice9_GetDirect3D failed (%08x)\n", hr); for (i = 0; i < (sizeof(dxt_formats) / sizeof(*dxt_formats)); ++i) { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, dxt_formats[i].fmt); + if(FAILED(hr)) + { + skip("Format %s not supported, skipping lockrect offset test\n", dxt_formats[i].name); + continue; + } + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, dxt_formats[i].fmt, D3DPOOL_SCRATCH, &surface, 0); ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr); @@ -217,6 +229,9 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr); base = locked_rect.pBits; + expected_pitch = (128 + dxt_formats[i].block_height - 1) / dxt_formats[i].block_width + * dxt_formats[i].block_size; + ok(locked_rect.Pitch == expected_pitch, "Got pitch %d, expected pitch %d for format %s\n", locked_rect.Pitch, expected_pitch, dxt_formats[i].name); hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr); @@ -227,7 +242,7 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr); offset = (BYTE *)locked_rect.pBits - base; - expected_offset = (rect.top / dxt_formats[i].block_height) * locked_rect.Pitch + expected_offset = (rect.top / dxt_formats[i].block_height) * expected_pitch + (rect.left / dxt_formats[i].block_width) * dxt_formats[i].block_size; ok(offset == expected_offset, "Got offset %u, expected offset %u for format %s\n", offset, expected_offset, dxt_formats[i].name); @@ -236,6 +251,7 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) IDirect3DSurface9_Release(surface); } + IDirect3D9_Release(d3d); } static void test_lockrect_invalid(IDirect3DDevice9 *device)

1 0

Alexandre Julliard : makedep: Append the separator if not found in an existing makefile.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 5eb4b094a39006af09d27dc21a9561f5d681123e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb4b094a39006af09d27dc21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 13:14:21 2010 +0100 makedep: Append the separator if not found in an existing makefile. --- tools/makedep.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 60278a9..c3b8720 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -929,15 +929,17 @@ static void output_dependencies(void) { char buffer[1024]; FILE *tmp_file = create_temp_file( &tmp_name ); + int found = 0; - while (fgets( buffer, sizeof(buffer), file )) + while (fgets( buffer, sizeof(buffer), file ) && !found) { if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) fatal_error( "error writing to %s\n", tmp_name ); - if (!strncmp( buffer, Separator, strlen(Separator) )) break; + found = !strncmp( buffer, Separator, strlen(Separator) ); } fclose( file ); file = tmp_file; + if (!found && list_head(&sources)) fprintf( file, "\n%s\n", Separator ); } else {

1 0

Alexandre Julliard : makedep: Output source dependency for bison files needed for parallel makes.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 133d4cde265cee06c6cebfb8665e0ced6cf80498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=133d4cde265cee06c6cebfb86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 13:27:51 2010 +0100 makedep: Output source dependency for bison files needed for parallel makes. --- tools/makedep.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c3b8720..9ce5bef 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -262,6 +262,18 @@ static INCL_FILE *find_src_file( const char *name ) } /******************************************************************* + * find_include_file + */ +static INCL_FILE *find_include_file( const char *name ) +{ + INCL_FILE *file; + + LIST_FOR_EACH_ENTRY( file, &includes, INCL_FILE, entry ) + if (!strcmp( name, file->name )) return file; + return NULL; +} + +/******************************************************************* * add_include * * Add an include file if it doesn't already exists. @@ -829,6 +841,10 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) *ext++ = 0; if (!strcmp( ext, "y" )) /* yacc file */ { + /* add source file dependency for parallel makes */ + char *header = strmake( "%s.tab.h", obj ); + if (find_include_file( header )) fprintf( file, "%s.tab.c: %s\n", obj, header ); + free( header ); *column += fprintf( file, "%s.tab.o: %s.tab.c", obj, obj ); } else if (!strcmp( ext, "l" )) /* lex file */

1 0

Alexandre Julliard : makefiles: Remove the no longer needed explicit separators for dependencies.
by Alexandre Julliard 16 Mar '10

16 Mar '10

1 0

Michael Stefaniuc : iphlpapi: Don't crash when enumerating PtP interfaces.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 0bbce793c315018ff20e10fcfa742d937f0f8e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbce793c315018ff20e10fcf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 16 01:09:40 2010 +0100 iphlpapi: Don't crash when enumerating PtP interfaces. --- dlls/iphlpapi/ifenum.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 8653454..5a3db75 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -807,7 +807,8 @@ ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs getInterfaceNameByIndex(index, name); for (p = ifa, n = 0; p; p = p->ifa_next) - if (p->ifa_addr->sa_family == AF_INET6 && !strcmp(name, p->ifa_name)) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && + !strcmp(name, p->ifa_name)) n++; if (n) { @@ -820,7 +821,8 @@ ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs for (p = ifa, n = 0; p; p = p->ifa_next) { - if (p->ifa_addr->sa_family == AF_INET6 && !strcmp(name, p->ifa_name)) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && + !strcmp(name, p->ifa_name)) { struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr;

1 0

Justin Chevrier : gdiplus/tests: Expand GdipImageGetFrameCount test coverage.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 94820ff0a40d8201df69ffec485c267cdf800986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94820ff0a40d8201df69ffec4… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Mon Mar 15 19:14:27 2010 -0400 gdiplus/tests: Expand GdipImageGetFrameCount test coverage. --- dlls/gdiplus/tests/image.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 2810b51..682c49f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -226,6 +226,19 @@ static void test_GdipImageGetFrameDimensionsCount(void) stat = GdipImageGetFrameDimensionsList((GpImage*)bm, &dimension, 0); expect(InvalidParameter, stat); + stat = GdipImageGetFrameCount(NULL, &dimension, &count); + expect(InvalidParameter, stat); + + /* WinXP crashes on this test */ + if(0) + { + stat = GdipImageGetFrameCount((GpImage*)bm, &dimension, NULL); + expect(InvalidParameter, stat); + } + + stat = GdipImageGetFrameCount((GpImage*)bm, NULL, &count); + todo_wine expect(Ok, stat); + count = 12345; stat = GdipImageGetFrameCount((GpImage*)bm, &dimension, &count); todo_wine expect(Ok, stat);

1 0

Piotr Caban : oleaut32: Fix importinfo flags.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: b7c50c7dbfff97ec01a4413bbfb92d2fdb70a479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c50c7dbfff97ec01a4413bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:39:31 2010 +0100 oleaut32: Fix importinfo flags. --- dlls/oleaut32/typelib2.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 60b9f73..6908bbf 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1575,6 +1575,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( WCHAR name[MAX_PATH], *p; TLIBATTR *tlibattr; TYPEATTR *typeattr; + TYPEKIND typekind; MSFT_GuidEntry guid, *check_guid; MSFT_ImpInfo impinfo; int guid_offset, import_offset; @@ -1641,6 +1642,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( guid.guid = typeattr->guid; guid.hreftype = This->typelib->typeinfo_guids*12+1; guid.next_hash = -1; + typekind = typeattr->typekind; ITypeInfo_ReleaseTypeAttr(pTInfo, typeattr); guid_offset = ctl2_alloc_guid(This->typelib, &guid); @@ -1654,7 +1656,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( This->typelib->typeinfo_guids++; /* Allocate importinfo */ - impinfo.flags = (This->typekind<<24) | MSFT_IMPINFO_OFFSET_IS_GUID; + impinfo.flags = (typekind<<24) | MSFT_IMPINFO_OFFSET_IS_GUID; impinfo.oImpFile = import_offset; impinfo.oGuid = guid_offset; *phRefType = ctl2_alloc_importinfo(This->typelib, &impinfo)+1;

1 0

Piotr Caban : oleaut32: Remove incorrect memid validation.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: d62534d1990c65c3c8a26c0f0daac2999492773f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62534d1990c65c3c8a26c0f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:39:46 2010 +0100 oleaut32: Remove incorrect memid validation. This code was trying to block negative values of memid (incorrectly). I have run more tests and found that it's possible to set some negative values (e.g. on TKIND_INTERFACE: -1, -4..-8, -500..?). Unless we know what values are allowed it's probably better to not check memid. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 6908bbf..d862667 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1689,7 +1689,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( TRACE("(%p,%d,%p)\n", iface, index, pFuncDesc); - if(!pFuncDesc || (pFuncDesc->memid>0x7fffffff && pFuncDesc->memid!=MEMBERID_NIL)) + if(!pFuncDesc) return E_INVALIDARG; TRACE("{%d,%p,%p,%d,%d,%d,%d,%d,%d,%d,{%d},%d}\n", pFuncDesc->memid,

1 0

Piotr Caban : oleaut32: Use QueryPathOfRegTypeLib in ICreateTypeInfo2_AddRefTypeInfo.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: d2f24ed8857f769494499b14691e708cb4a5031a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f24ed8857f769494499b146… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:40:01 2010 +0100 oleaut32: Use QueryPathOfRegTypeLib in ICreateTypeInfo2_AddRefTypeInfo. --- dlls/oleaut32/typelib2.c | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index d862667..59f431e 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1566,20 +1566,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( /* Process locally defined TypeInfo */ *phRefType = This->typelib->typelib_typeinfo_offsets[index]; } else { - static const WCHAR regkey[] = {'T','y','p','e','L','i','b','\\','{', - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%', - '0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x', - '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x', - '}','\\','%','d','.','%','d','\\','0','\\','w','i','n','3','2',0}; - - WCHAR name[MAX_PATH], *p; + BSTR name; TLIBATTR *tlibattr; TYPEATTR *typeattr; TYPEKIND typekind; MSFT_GuidEntry guid, *check_guid; MSFT_ImpInfo impinfo; int guid_offset, import_offset; - DWORD len; HRESULT hres; /* Allocate container GUID */ @@ -1605,27 +1598,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( This->typelib->typelib_guids++; /* Get import file name */ - /* Check HKEY_CLASSES_ROOT\TypeLib\{GUID}\{Ver}\0\win32 */ - len = MAX_PATH; - sprintfW(name, regkey, guid.guid.Data1, guid.guid.Data2, - guid.guid.Data3, guid.guid.Data4[0], guid.guid.Data4[1], - guid.guid.Data4[2], guid.guid.Data4[3], guid.guid.Data4[4], - guid.guid.Data4[5], guid.guid.Data4[6], guid.guid.Data4[7], - tlibattr->wMajorVerNum, tlibattr->wMinorVerNum); - - if(RegGetValueW(HKEY_CLASSES_ROOT, name, NULL, RRF_RT_REG_SZ, NULL, name, &len)!=ERROR_SUCCESS - || (p=strrchrW(name, '\\'))==NULL) { - ERR("Error guessing typelib filename\n"); + hres = QueryPathOfRegTypeLib(&guid.guid, tlibattr->wMajorVerNum, + tlibattr->wMinorVerNum, tlibattr->lcid, &name); + if(FAILED(hres)) { ITypeLib_ReleaseTLibAttr(container, tlibattr); ITypeLib_Release(container); - return E_NOTIMPL; + return hres; } - memmove(name, p+1, strlenW(p)*sizeof(WCHAR)); /* Import file */ - import_offset = ctl2_alloc_importfile(This->typelib, guid_offset, - tlibattr->lcid, tlibattr->wMajorVerNum, tlibattr->wMinorVerNum, name); + import_offset = ctl2_alloc_importfile(This->typelib, guid_offset, tlibattr->lcid, + tlibattr->wMajorVerNum, tlibattr->wMinorVerNum, strrchrW(name, '\\')+1); ITypeLib_ReleaseTLibAttr(container, tlibattr); + SysFreeString(name); if(import_offset == -1) { ITypeLib_Release(container);

1 0

Piotr Caban : oleaut32: Improved ICreateTypeInfo AddFuncDesc implementation .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: aecd956b7ebe5e865b4b9a42a34d29feaba9a8c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aecd956b7ebe5e865b4b9a42a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:40:15 2010 +0100 oleaut32: Improved ICreateTypeInfo AddFuncDesc implementation. --- dlls/oleaut32/tests/typelib.c | 12 ++++++++++-- dlls/oleaut32/typelib2.c | 25 ++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index b31466e..797ac02 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1265,6 +1265,14 @@ static void test_CreateTypeLib(void) { hres = ITypeInfo_GetImplTypeFlags(interface2, 1, &impltypeflags); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + funcdesc.oVft = 0xaaac; + hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + funcdesc.oVft = 0xaaa8; + hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + funcdesc.oVft = 0; + ICreateTypeInfo_Release(createti); hres = ICreateTypeLib_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); @@ -1412,10 +1420,10 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); - ok(typeattr->cFuncs == 0, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cFuncs == 2, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); - ok(typeattr->cbSizeVft == 56, "cbSizeVft = %d\n", typeattr->cbSizeVft); + ok(typeattr->cbSizeVft == 43696, "cbSizeVft = %d\n", typeattr->cbSizeVft); ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); ok(typeattr->wTypeFlags == 0, "wTypeFlags = %d\n", typeattr->wTypeFlags); ok(typeattr->wMajorVerNum == 0, "wMajorVerNum = %d\n", typeattr->wMajorVerNum); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 59f431e..3a92bad 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1674,7 +1674,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( TRACE("(%p,%d,%p)\n", iface, index, pFuncDesc); - if(!pFuncDesc) + if(!pFuncDesc || pFuncDesc->oVft&3) return E_INVALIDARG; TRACE("{%d,%p,%p,%d,%d,%d,%d,%d,%d,%d,{%d},%d}\n", pFuncDesc->memid, @@ -1683,6 +1683,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( pFuncDesc->cParamsOpt, pFuncDesc->oVft, pFuncDesc->cScodes, pFuncDesc->elemdescFunc.tdesc.vt, pFuncDesc->wFuncFlags); + if(pFuncDesc->cParamsOpt || pFuncDesc->cScodes) + FIXME("Unimplemented parameter - created typelib will be incorrect\n"); + switch(This->typekind) { case TKIND_MODULE: if(pFuncDesc->funckind != FUNC_STATIC) @@ -1736,7 +1739,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( typedata[0] = 0x18 + pFuncDesc->cParams*(num_defaults?16:12); ctl2_encode_typedesc(This->typelib, &pFuncDesc->elemdescFunc.tdesc, &typedata[1], NULL, NULL, &decoded_size); typedata[2] = pFuncDesc->wFuncFlags; - typedata[3] = ((sizeof(FUNCDESC) + decoded_size) << 16) | This->typeinfo->cbSizeVft; + typedata[3] = ((sizeof(FUNCDESC) + decoded_size) << 16) | (unsigned short)(pFuncDesc->oVft?pFuncDesc->oVft+1:0); typedata[4] = (pFuncDesc->callconv << 8) | (pFuncDesc->invkind << 3) | pFuncDesc->funckind; if(num_defaults) typedata[4] |= 0x1000; typedata[5] = pFuncDesc->cParams; @@ -2352,6 +2355,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( CyclicList *iter, *iter2, **typedata; HREFTYPE hreftype; HRESULT hres; + unsigned user_vft = 0; int i; TRACE("(%p)\n", iface); @@ -2435,6 +2439,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( /* Assign IDs and VTBL entries */ i = 0; + if(This->typedata->u.data[3]&1) + user_vft = This->typedata->u.data[3]&0xffff; + for(iter=This->typedata->next->next; iter!=This->typedata->next; iter=iter->next) { /* Assign MEMBERID if MEMBERID_NIL was specified */ if(iter->indice == MEMBERID_NIL) { @@ -2460,7 +2467,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( iter->u.data[0] = (iter->u.data[0]&0xffff) | (i<<16); - if(This->typekind != TKIND_MODULE) { + if((iter->u.data[3]&1) != (user_vft&1)) + return TYPE_E_INVALIDID; + + if(user_vft&1) { + if(user_vft < (iter->u.data[3]&0xffff)) + user_vft = (iter->u.data[3]&0xffff); + + if((iter->u.data[3]&0xffff) < This->typeinfo->cbSizeVft) + return TYPE_E_INVALIDID; + } else if(This->typekind != TKIND_MODULE) { iter->u.data[3] = (iter->u.data[3]&0xffff0000) | This->typeinfo->cbSizeVft; This->typeinfo->cbSizeVft += 4; } @@ -2483,6 +2499,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( i++; } + if(user_vft) + This->typeinfo->cbSizeVft = user_vft+3; + for(i=0; i<(This->typeinfo->cElement&0xffff); i++) { if(typedata[i]->u.data[4]>>16 > i) { int inv;

1 0