February 2010 - Wine-commits

Alexandre Julliard : user32/tests: Fix broken check of the ok() macro return value.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: c888a2eb227ad4a0c731b77188830969ba21bbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c888a2eb227ad4a0c731b7718… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:04:11 2010 +0100 user32/tests: Fix broken check of the ok() macro return value. Spotted by Yann Droneaud. --- dlls/user32/tests/scroll.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 03725b9..0695639 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -411,8 +411,8 @@ START_TEST ( scroll ) WS_OVERLAPPEDWINDOW|WS_VSCROLL|WS_HSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); - if ( !ok( hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n" ) ) - return; + ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); + if (!hMainWnd) return; assert( hScroll );

1 0

Alexandre Julliard : comctl32/tests: Fix broken check of the ok() macro return value.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 2432b0f6b91e57e886dfe39db83d991fde00c2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2432b0f6b91e57e886dfe39db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:04:18 2010 +0100 comctl32/tests: Fix broken check of the ok() macro return value. Spotted by Yann Droneaud. --- dlls/comctl32/tests/treeview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 74d4d0e..953b54a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1060,8 +1060,8 @@ START_TEST(treeview) hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); - if ( !ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n") ) - return; + ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); + if (!hMainWnd) return; test_fillroot(); test_select();

1 0

Paul Vriens : ntdll/tests: Fix a crash on some Vista boxes.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 563785dfc2b759b53d0e7f358b509d222ed9b2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563785dfc2b759b53d0e7f358… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 24 15:33:01 2010 +0100 ntdll/tests: Fix a crash on some Vista boxes. --- dlls/ntdll/tests/reg.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 8a86627..9d8b8c2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -735,32 +735,37 @@ static void test_symlinks(void) "wrong len %u\n", len ); pNtClose( key ); - /* reopen the link from itself */ + if (0) /* crashes the Windows kernel on some Vista systems */ + { + /* reopen the link from itself */ - attr.RootDirectory = link; - attr.Attributes = OBJ_OPENLINK; - attr.ObjectName = &null_str; - status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); - len = sizeof(buffer); - status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); - ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); - ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR), - "wrong len %u\n", len ); - pNtClose( key ); + attr.RootDirectory = link; + attr.Attributes = OBJ_OPENLINK; + attr.ObjectName = &null_str; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); + len = sizeof(buffer); + status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); + ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR), + "wrong len %u\n", len ); + pNtClose( key ); - status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - len = sizeof(buffer); - status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); - ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); - ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR), - "wrong len %u\n", len ); - pNtClose( key ); + status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + len = sizeof(buffer); + status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); + ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR), + "wrong len %u\n", len ); + pNtClose( key ); + } if (0) /* crashes the Windows kernel in most versions */ { + attr.RootDirectory = link; attr.Attributes = 0; + attr.ObjectName = &null_str; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); len = sizeof(buffer);

1 0

Alexandre Julliard : kernel32/tests: Fix broken usage of the ok() macro return value.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: fbbac38e4ed9fd95d5ab3d0422bcc55ee2d39498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbac38e4ed9fd95d5ab3d042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:47:48 2010 +0100 kernel32/tests: Fix broken usage of the ok() macro return value. Spotted by Yann Droneaud. --- dlls/kernel32/tests/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3493ff3..b6f066e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1602,12 +1602,12 @@ static void test_LockFile(void) /* zero-byte lock */ ok( LockFile( handle, 100, 0, 0, 0 ), "LockFile 100,0 failed\n" ); - limited_LockFile || ok( !LockFile( handle, 98, 0, 4, 0 ), "LockFile 98,4 succeeded\n" ); + if (!limited_LockFile) ok( !LockFile( handle, 98, 0, 4, 0 ), "LockFile 98,4 succeeded\n" ); ok( LockFile( handle, 90, 0, 10, 0 ), "LockFile 90,10 failed\n" ); - limited_LockFile || ok( !LockFile( handle, 100, 0, 10, 0 ), "LockFile 100,10 failed\n" ); + if (!limited_LockFile) ok( !LockFile( handle, 100, 0, 10, 0 ), "LockFile 100,10 failed\n" ); ok( UnlockFile( handle, 90, 0, 10, 0 ), "UnlockFile 90,10 failed\n" ); - !ok( UnlockFile( handle, 100, 0, 10, 0 ), "UnlockFile 100,10 failed\n" ); + ok( !UnlockFile( handle, 100, 0, 10, 0 ), "UnlockFile 100,10 succeeded\n" ); ok( UnlockFile( handle, 100, 0, 0, 0 ), "UnlockFile 100,0 failed\n" );

1 0

Alexandre Julliard : tests: The ok() macro shouldn't return a value.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 69ee0ad151b4ae14fa017d3f5a284af587d7de01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ee0ad151b4ae14fa017d3f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:48:07 2010 +0100 tests: The ok() macro shouldn't return a value. --- include/wine/test.h | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 5d371c5..e6a7711 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -88,21 +88,21 @@ extern void winetest_vskip( const char *msg, va_list ap ); #ifdef __GNUC__ -extern int winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); +extern void winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ -extern int winetest_ok( int condition, const char *msg, ... ); +extern void winetest_ok( int condition, const char *msg, ... ); extern void winetest_skip( const char *msg, ... ); extern void winetest_win_skip( const char *msg, ... ); extern void winetest_trace( const char *msg, ... ); #endif /* __GNUC__ */ -#define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok +#define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok #define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip #define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip #define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace @@ -330,15 +330,13 @@ int winetest_vok( int condition, const char *msg, va_list args ) } } -int winetest_ok( int condition, const char *msg, ... ) +void winetest_ok( int condition, const char *msg, ... ) { va_list valist; - int rc; va_start(valist, msg); - rc=winetest_vok(condition, msg, valist); + winetest_vok(condition, msg, valist); va_end(valist); - return rc; } void winetest_trace( const char *msg, ... )

1 0

Piotr Caban : oleaut32: Added implementation of ITypeInfo2_fnGetTypeAttr.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: b6cf636c6eb20d0378afa36d8959b031dd9603fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cf636c6eb20d0378afa36d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 24 14:24:12 2010 +0100 oleaut32: Added implementation of ITypeInfo2_fnGetTypeAttr. --- dlls/oleaut32/tests/typelib.c | 31 +++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 46 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 0dfd5bb..4da8ba5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -990,6 +990,7 @@ static void test_CreateTypeLib(void) { ELEMDESC elemdesc[5]; PARAMDESCEX paramdescex; TYPEDESC typedesc1, typedesc2; + TYPEATTR *typeattr; HREFTYPE hreftype; HRESULT hres; @@ -1182,6 +1183,36 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo_Release(createti2); + hres = ITypeInfo_GetTypeAttr(interface1, &typeattr); + 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 == 11, "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->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); + ok(typeattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", typeattr->wMinorVerNum); + + ITypeInfo_ReleaseTypeAttr(interface1, typeattr); + + hres = ITypeInfo_GetTypeAttr(interface2, &typeattr); + 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->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->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); + ok(typeattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", typeattr->wMinorVerNum); + + ITypeInfo_ReleaseTypeAttr(interface2, typeattr); + hres = ICreateTypeLib2_SaveAllChanges(createtl); ok(hres == S_OK, "got %08x\n", hres); ICreateTypeLib2_Release(createtl); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 71e8e81..5c1c702 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2723,8 +2723,45 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeAttr( ITypeInfo2* iface, TYPEATTR** ppTypeAttr) { - FIXME("(%p,%p), stub!\n", iface, ppTypeAttr); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface); + HRESULT hres; + + TRACE("(%p,%p)\n", iface, ppTypeAttr); + + if(!ppTypeAttr) + return E_INVALIDARG; + + hres = ICreateTypeInfo_LayOut((ICreateTypeInfo*)This); + if(FAILED(hres)) + return hres; + + *ppTypeAttr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TYPEATTR)); + if(!*ppTypeAttr) + return E_OUTOFMEMORY; + + if(This->typeinfo->posguid != -1) { + MSFT_GuidEntry *guid; + + guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][This->typeinfo->posguid]; + (*ppTypeAttr)->guid = guid->guid; + } + + (*ppTypeAttr)->lcid = This->typelib->typelib_header.lcid; + (*ppTypeAttr)->cbSizeInstance = This->typeinfo->size; + (*ppTypeAttr)->typekind = This->typeinfo->typekind&0xf; + (*ppTypeAttr)->cFuncs = This->typeinfo->cElement&0xffff; + (*ppTypeAttr)->cVars = This->typeinfo->cElement>>16; + (*ppTypeAttr)->cImplTypes = This->typeinfo->cImplTypes; + (*ppTypeAttr)->cbSizeVft = This->typeinfo->cbSizeVft; + (*ppTypeAttr)->cbAlignment = (This->typeinfo->typekind>>11) & 0x1f; + (*ppTypeAttr)->wTypeFlags = This->typeinfo->flags; + (*ppTypeAttr)->wMajorVerNum = This->typeinfo->version&0xffff; + (*ppTypeAttr)->wMinorVerNum = This->typeinfo->version>>16; + + if((*ppTypeAttr)->typekind == TKIND_ALIAS) + FIXME("TKIND_ALIAS handling not implemented\n"); + + return S_OK; } /****************************************************************************** @@ -3014,7 +3051,10 @@ static void WINAPI ITypeInfo2_fnReleaseTypeAttr( ITypeInfo2* iface, TYPEATTR* pTypeAttr) { - FIXME("(%p,%p), stub!\n", iface, pTypeAttr); + TRACE("(%p,%p)\n", iface, pTypeAttr); + + if(pTypeAttr) + HeapFree(GetProcessHeap(), 0, pTypeAttr); } /******************************************************************************

1 0

Piotr Caban : oleaut32: Fix importfile searching in ctl2_alloc_importinfo.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: e8d117f5a1a03788367f674d4c1367084b76e387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d117f5a1a03788367f674d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 24 14:25:55 2010 +0100 oleaut32: Fix importfile searching in ctl2_alloc_importinfo. --- dlls/oleaut32/typelib2.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 5c1c702..7ccb400 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -692,19 +692,20 @@ static int ctl2_alloc_string( * Failure: -1 (this is invariably an out of memory condition). */ static int ctl2_alloc_importinfo( - ICreateTypeLib2Impl *This, /* [I] The type library to allocate in. */ - MSFT_ImpInfo *impinfo) /* [I] The import information to store. */ + ICreateTypeLib2Impl *This, /* [I] The type library to allocate in. */ + MSFT_ImpInfo *impinfo) /* [I] The import information to store. */ { int offset; MSFT_ImpInfo *impinfo_space; - for (offset = 0; - offset < This->typelib_segdir[MSFT_SEG_IMPORTINFO].length; - offset += sizeof(MSFT_ImpInfo)) { - if (!memcmp(&(This->typelib_segment_data[MSFT_SEG_IMPORTINFO][offset]), - impinfo, sizeof(MSFT_ImpInfo))) { - return offset; - } + impinfo_space = (MSFT_ImpInfo*)&This->typelib_segment_data[MSFT_SEG_IMPORTINFO][0]; + for (offset=0; offset<This->typelib_segdir[MSFT_SEG_IMPORTINFO].length; + offset+=sizeof(MSFT_ImpInfo)) { + if(impinfo_space->oImpFile == impinfo->oImpFile + && impinfo_space->oGuid == impinfo->oGuid) + return offset; + + impinfo_space += 1; } impinfo->flags |= This->typelib_header.nimpinfos++;

1 0

Piotr Caban : oleaut32: Improve TKIND_COCLASS handling while creating typelib.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: ea6b690f823daec63ac80da1cb7e2364e5d679be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6b690f823daec63ac80da1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 24 14:26:32 2010 +0100 oleaut32: Improve TKIND_COCLASS handling while creating typelib. --- dlls/oleaut32/tests/typelib.c | 39 +++++++++++++++++++++++++++++++++------ dlls/oleaut32/typelib2.c | 9 ++++++--- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 4da8ba5..6f2fcd9 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -972,6 +972,7 @@ static void test_CreateTypeLib(void) { static const WCHAR stdoleW[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; static OLECHAR interface2W[] = {'i','n','t','e','r','f','a','c','e','2',0}; + static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; static OLECHAR func1W[] = {'f','u','n','c','1',0}; static OLECHAR func2W[] = {'f','u','n','c','2',0}; @@ -983,7 +984,7 @@ static void test_CreateTypeLib(void) { char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *createtl; - ICreateTypeInfo *createti, *createti2; + ICreateTypeInfo *createti; ITypeLib *tl, *stdole; ITypeInfo *interface1, *interface2, *unknown, *ti; FUNCDESC funcdesc; @@ -1163,13 +1164,13 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == TYPE_E_NAMECONFLICT, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti2); + hres = ICreateTypeLib_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); - hres = ICreateTypeInfo_QueryInterface(createti2, &IID_ITypeInfo, (void**)&interface2); + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface2); ok(hres == S_OK, "got %08x\n", hres); - hres = ICreateTypeInfo_AddRefTypeInfo(createti2, interface1, &hreftype); + hres = ICreateTypeInfo_AddRefTypeInfo(createti, interface1, &hreftype); ok(hres == S_OK, "got %08x\n", hres); hres = ITypeInfo_GetRefTypeInfo(interface2, 0, &ti); @@ -1178,10 +1179,36 @@ static void test_CreateTypeLib(void) { ITypeInfo_Release(ti); - hres = ICreateTypeInfo_AddImplType(createti2, 0, hreftype); + hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + ICreateTypeInfo_Release(createti); + + hres = ICreateTypeLib_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddRefTypeInfo(createti, interface1, &hreftype); ok(hres == S_OK, "got %08x\n", hres); - ICreateTypeInfo_Release(createti2); + hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddImplType(createti, 1, hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddImplType(createti, 1, hreftype); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddImplType(createti, 2, hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + ICreateTypeInfo_Release(createti); hres = ITypeInfo_GetTypeAttr(interface1, &typeattr); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 7ccb400..a8d83bf 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1799,12 +1799,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType( if( index != 0) return TYPE_E_ELEMENTNOTFOUND; This->typeinfo->datatype1 = hRefType; - This->typeinfo->cImplTypes++; } else { FIXME("AddImplType unsupported on typekind %d\n", This->typeinfo->typekind & 15); return E_OUTOFMEMORY; } + This->typeinfo->cImplTypes++; return S_OK; } @@ -2254,6 +2254,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( TRACE("(%p)\n", iface); + if((This->typeinfo->typekind&0xf) == TKIND_COCLASS) + return S_OK; + /* Validate inheritance */ This->typeinfo->datatype2 = 0; hreftype = This->typeinfo->datatype1; @@ -3933,9 +3936,9 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 * iface) filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_TYPEINFO); filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_GUIDHASH); filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_GUID); + filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_REFERENCES); filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_IMPORTINFO); filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_IMPORTFILES); - filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_REFERENCES); filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_NAMEHASH); filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_NAME); filepos += ctl2_finalize_segment(This, filepos, MSFT_SEG_STRING); @@ -3958,9 +3961,9 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 * iface) if (!ctl2_write_segment(This, hFile, MSFT_SEG_TYPEINFO )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_GUIDHASH )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_GUID )) return retval; + if (!ctl2_write_segment(This, hFile, MSFT_SEG_REFERENCES )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_IMPORTINFO )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_IMPORTFILES )) return retval; - if (!ctl2_write_segment(This, hFile, MSFT_SEG_REFERENCES )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_NAMEHASH )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_NAME )) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_STRING )) return retval;

1 0

Piotr Caban : oleaut32/tests: Remove incorrect test.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 69579b0449d8a772b31518a54dfb0643680570ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=69579b0449d8a772b31518a54… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 24 14:26:57 2010 +0100 oleaut32/tests: Remove incorrect test. This test is crashing on some systems. --- dlls/oleaut32/tests/typelib.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6f2fcd9..d1a5df0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1018,9 +1018,6 @@ static void test_CreateTypeLib(void) { hres = ITypeInfo_GetRefTypeInfo(interface1, 0, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ITypeInfo_GetRefTypeInfo(interface1, 16, &ti); - ok(hres == E_FAIL, "got %08x\n", hres); - hres = ICreateTypeInfo_LayOut(createti); ok(hres == S_OK, "got %08x\n", hres);

1 0

Piotr Caban : oleaut32: Added implementation of ITypeInfo2_GetImplTypeFlags .
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 3183786367401ab5cc1120c08cd5316c160aa5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3183786367401ab5cc1120c08… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 24 14:27:46 2010 +0100 oleaut32: Added implementation of ITypeInfo2_GetImplTypeFlags. --- dlls/oleaut32/tests/typelib.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 26 ++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d1a5df0..be90570 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -993,6 +993,7 @@ static void test_CreateTypeLib(void) { TYPEDESC typedesc1, typedesc2; TYPEATTR *typeattr; HREFTYPE hreftype; + int impltypeflags; HRESULT hres; trace("CreateTypeLib tests\n"); @@ -1179,6 +1180,16 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetImplTypeFlags(createti, 0, IMPLTYPEFLAG_FDEFAULT); + ok(hres == TYPE_E_BADMODULEKIND, "got %08x\n", hres); + + hres = ITypeInfo_GetImplTypeFlags(interface2, 0, &impltypeflags); + ok(hres == S_OK, "got %08x\n", hres); + ok(impltypeflags == 0, "impltypeflags = %x\n", impltypeflags); + + hres = ITypeInfo_GetImplTypeFlags(interface2, 1, &impltypeflags); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + ICreateTypeInfo_Release(createti); hres = ICreateTypeLib_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); @@ -1205,6 +1216,32 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddImplType(createti, 2, hreftype); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetImplTypeFlags(createti, 0, IMPLTYPEFLAG_FDEFAULT); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetImplTypeFlags(createti, 1, IMPLTYPEFLAG_FRESTRICTED); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&ti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo_GetImplTypeFlags(ti, 0, NULL); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ITypeInfo_GetImplTypeFlags(ti, 0, &impltypeflags); + ok(hres == S_OK, "got %08x\n", hres); + ok(impltypeflags == IMPLTYPEFLAG_FDEFAULT, "impltypeflags = %x\n", impltypeflags); + + hres = ITypeInfo_GetImplTypeFlags(ti, 1, &impltypeflags); + ok(hres == S_OK, "got %08x\n", hres); + ok(impltypeflags == IMPLTYPEFLAG_FRESTRICTED, "impltypeflags = %x\n", impltypeflags); + + hres = ITypeInfo_GetImplTypeFlags(ti, 2, &impltypeflags); + ok(hres == S_OK, "got %08x\n", hres); + ok(impltypeflags == 0, "impltypeflags = %x\n", impltypeflags); + + ITypeInfo_Release(ti); + ICreateTypeInfo_Release(createti); hres = ITypeInfo_GetTypeAttr(interface1, &typeattr); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a8d83bf..8a3d808 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2849,8 +2849,30 @@ static HRESULT WINAPI ITypeInfo2_fnGetImplTypeFlags( UINT index, INT* pImplTypeFlags) { - FIXME("(%p,%d,%p), stub!\n", iface, index, pImplTypeFlags); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface); + int offset; + MSFT_RefRecord *ref; + + TRACE("(%p,%d,%p)\n", iface, index, pImplTypeFlags); + + if(!pImplTypeFlags) + return E_INVALIDARG; + + if(index >= This->typeinfo->cImplTypes) + return TYPE_E_ELEMENTNOTFOUND; + + if((This->typeinfo->typekind&0xf) != TKIND_COCLASS) { + *pImplTypeFlags = 0; + return S_OK; + } + + offset = ctl2_find_nth_reference(This->typelib, This->typeinfo->datatype1, index); + if(offset == -1) + return TYPE_E_ELEMENTNOTFOUND; + + ref = (MSFT_RefRecord *)&This->typelib->typelib_segment_data[MSFT_SEG_REFERENCES][offset]; + *pImplTypeFlags = ref->flags; + return S_OK; } /******************************************************************************

1 0