February 2010 - Wine-Commits

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

Feb. 24, 2010

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

Dmitry Timoshkov : user32: DeleteDC() should allow to delete a DC returned by GetDC().
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

Module: wine Branch: master Commit: d6cfc3223ef8861830237fe415667a5ba73231d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6cfc3223ef8861830237fe41… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 24 22:44:41 2010 +0800 user32: DeleteDC() should allow to delete a DC returned by GetDC(). --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/tests/dc.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/painting.c | 3 +- 3 files changed, 154 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 2aeeec2..577c151 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -819,7 +819,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) if (dc->hookProc && !dc->hookProc( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) { release_dc_ptr( dc ); - return FALSE; + return TRUE; } while (dc->saveLevel) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 1efde38..43c2480 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -69,7 +69,7 @@ static void test_savedc_2(void) assert(hrgn != 0); hdc = GetDC(hwnd); - ok(hdc != NULL, "CreateDC rets %p\n", hdc); + ok(hdc != NULL, "GetDC failed\n"); ret = GetClipBox(hdc, &rc_clip); ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret); @@ -328,6 +328,155 @@ static void test_DC_bitmap(void) ReleaseDC( 0, hdc ); } +static void test_DeleteDC(void) +{ + HWND hwnd; + HDC hdc, hdc_test; + WNDCLASSEX cls; + int ret; + + /* window DC */ + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP|WS_VISIBLE, 0,0,100,100, + 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA failed\n"); + + hdc = GetDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + hdc = GetWindowDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + DestroyWindow(hwnd); + + /* desktop window DC */ + hwnd = GetDesktopWindow(); + ok(hwnd != 0, "GetDesktopWindow failed\n"); + + hdc = GetDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + hdc = GetWindowDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + /* CS_CLASSDC */ + memset(&cls, 0, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.style = CS_CLASSDC; + cls.hInstance = GetModuleHandle(0); + cls.lpszClassName = "Wine class DC"; + cls.lpfnWndProc = DefWindowProcA; + ret = RegisterClassExA(&cls); + ok(ret, "RegisterClassExA failed\n"); + + hwnd = CreateWindowExA(0, "Wine class DC", NULL, WS_POPUP|WS_VISIBLE, 0,0,100,100, + 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA failed\n"); + + hdc = GetDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = ReleaseDC(hwnd, hdc); + ok(ret, "ReleaseDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + + hdc_test = hdc; + + hdc = GetWindowDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + DestroyWindow(hwnd); + + ret = GetObjectType(hdc_test); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + + ret = UnregisterClassA("Wine class DC", GetModuleHandle(NULL)); + ok(ret, "UnregisterClassA failed\n"); + + ret = GetObjectType(hdc_test); +todo_wine + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + /* CS_OWNDC */ + memset(&cls, 0, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.style = CS_OWNDC; + cls.hInstance = GetModuleHandle(0); + cls.lpszClassName = "Wine own DC"; + cls.lpfnWndProc = DefWindowProcA; + ret = RegisterClassExA(&cls); + ok(ret, "RegisterClassExA failed\n"); + + hwnd = CreateWindowExA(0, "Wine own DC", NULL, WS_POPUP|WS_VISIBLE, 0,0,100,100, + 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA failed\n"); + + hdc = GetDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = ReleaseDC(hwnd, hdc); + ok(ret, "ReleaseDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + + hdc = GetWindowDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + DestroyWindow(hwnd); + + ret = GetObjectType(hdc_test); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + ret = UnregisterClassA("Wine own DC", GetModuleHandle(NULL)); + ok(ret, "UnregisterClassA failed\n"); +} + START_TEST(dc) { test_savedc(); @@ -335,4 +484,5 @@ START_TEST(dc) test_GdiConvertToDevmodeW(); test_CreateCompatibleDC(); test_DC_bitmap(); + test_DeleteDC(); } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index cde642c..732c889 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -296,6 +296,7 @@ static struct dce *get_window_dce( HWND hwnd ) { win->dce = dce; dce->hwnd = hwnd; + dce->count++; list_add_tail( &dce_list, &dce->entry ); } WIN_ReleasePtr( win ); @@ -495,7 +496,7 @@ static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam * (between GetDC and ReleaseDC) */ USER_Lock(); - if (dce->count) + if (dce->count > 1) { WARN("Application trying to delete a busy DC %p\n", dce->hdc); retv = FALSE;

1 0

Alexandre Julliard : shell32/tests: Don' t use the return value of the ok macro.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

Module: wine Branch: master Commit: d279227538a32130c437ba8523f7c928e1b1d109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d279227538a32130c437ba852… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:03:15 2010 +0100 shell32/tests: Don't use the return value of the ok macro. --- dlls/shell32/tests/shlexec.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index c673f0a..5d5db34 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -672,28 +672,28 @@ static int StrCmpPath(const char* s1, const char* s2) return 0; } -static int _okChildString(const char* file, int line, const char* key, const char* expected) +static void _okChildString(const char* file, int line, const char* key, const char* expected) { char* result; result=getChildString("Arguments", key); - return ok_(file, line)(lstrcmpiA(result, expected) == 0, - "%s expected '%s', got '%s'\n", key, expected, result); + ok_(file, line)(lstrcmpiA(result, expected) == 0, + "%s expected '%s', got '%s'\n", key, expected, result); } -static int _okChildPath(const char* file, int line, const char* key, const char* expected) +static void _okChildPath(const char* file, int line, const char* key, const char* expected) { char* result; result=getChildString("Arguments", key); - return ok_(file, line)(StrCmpPath(result, expected) == 0, - "%s expected '%s', got '%s'\n", key, expected, result); + ok_(file, line)(StrCmpPath(result, expected) == 0, + "%s expected '%s', got '%s'\n", key, expected, result); } -static int _okChildInt(const char* file, int line, const char* key, int expected) +static void _okChildInt(const char* file, int line, const char* key, int expected) { INT result; result=GetPrivateProfileIntA("Arguments", key, expected, child_file); - return ok_(file, line)(result == expected, - "%s expected %d, but got %d\n", key, expected, result); + ok_(file, line)(result == expected, + "%s expected %d, but got %d\n", key, expected, result); } #define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected))

1 0

Alexandre Julliard : shell32/tests: Fix broken check of the ok() macro return value.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

Module: wine Branch: master Commit: d5a54642f478a530cf7672332c423233d11f157f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a54642f478a530cf7672332… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:04:05 2010 +0100 shell32/tests: Fix broken check of the ok() macro return value. Spotted by Yann Droneaud. --- dlls/shell32/tests/autocomplete.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 042e238..569625f 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -126,9 +126,8 @@ START_TEST(autocomplete) return; createMainWnd(); - - 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; ac = test_init(); if (!ac)

1 0

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

Feb. 24, 2010

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

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

Feb. 24, 2010

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: Fix importfile searching in ctl2_alloc_importinfo.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

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/tests: Remove incorrect test.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

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_GetRefTypeOfImplType.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

Module: wine Branch: master Commit: 77e1b7a13f858e678e8918a3c7e3987ebd93d385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e1b7a13f858e678e8918a3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 24 14:28:09 2010 +0100 oleaut32: Added implementation of ITypeInfo2_GetRefTypeOfImplType. --- dlls/oleaut32/tests/typelib.c | 23 +++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index be90570..aaaaceb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1037,6 +1037,10 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetRefTypeOfImplType(interface1, 0, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 3, "hreftype = %d\n", hreftype); + memset(&funcdesc, 0, sizeof(FUNCDESC)); funcdesc.funckind = FUNC_PUREVIRTUAL; funcdesc.invkind = INVOKE_PROPERTYGET; @@ -1168,6 +1172,9 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface2); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetRefTypeOfImplType(interface2, 0, &hreftype); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + hres = ICreateTypeInfo_AddRefTypeInfo(createti, interface1, &hreftype); ok(hres == S_OK, "got %08x\n", hres); @@ -1180,6 +1187,10 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetRefTypeOfImplType(interface2, 0, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 2, "hreftype = %d\n", hreftype); + hres = ICreateTypeInfo_SetImplTypeFlags(createti, 0, IMPLTYPEFLAG_FDEFAULT); ok(hres == TYPE_E_BADMODULEKIND, "got %08x\n", hres); @@ -1240,6 +1251,18 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(impltypeflags == 0, "impltypeflags = %x\n", impltypeflags); + hres = ITypeInfo_GetRefTypeOfImplType(ti, 0, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 0, "hreftype = %d\n", hreftype); + + hres = ITypeInfo_GetRefTypeOfImplType(ti, 1, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 1, "hreftype = %d\n", hreftype); + + hres = ITypeInfo_GetRefTypeOfImplType(ti, 2, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 1, "hreftype = %d\n", hreftype); + ITypeInfo_Release(ti); ICreateTypeInfo_Release(createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8a3d808..03db7b5 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2835,8 +2835,35 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeOfImplType( UINT index, HREFTYPE* pRefType) { - FIXME("(%p,%d,%p), stub!\n", iface, index, pRefType); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface); + MSFT_RefRecord *ref; + int offset; + + TRACE("(%p,%d,%p)\n", iface, index, pRefType); + + if(!pRefType) + return E_INVALIDARG; + + if(index == -1) { + FIXME("Dual interfaces not handled yet\n"); + return E_NOTIMPL; + } + + if(index >= This->typeinfo->cImplTypes) + return TYPE_E_ELEMENTNOTFOUND; + + if((This->typeinfo->typekind&0xf) == TKIND_INTERFACE) { + *pRefType = This->typeinfo->datatype1 + 2; + 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]; + *pRefType = ref->reftype; + return S_OK; } /****************************************************************************** @@ -2968,10 +2995,10 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeInfo( WCHAR *filename; HRESULT hres; - if(hRefType-1 >= This->typelib->typelib_segdir[MSFT_SEG_IMPORTINFO].length) + if((hRefType&(~0x3)) >= This->typelib->typelib_segdir[MSFT_SEG_IMPORTINFO].length) return E_FAIL; - impinfo = (MSFT_ImpInfo*)&This->typelib->typelib_segment_data[MSFT_SEG_IMPORTINFO][hRefType-1]; + impinfo = (MSFT_ImpInfo*)&This->typelib->typelib_segment_data[MSFT_SEG_IMPORTINFO][hRefType&(~0x3)]; impfile = (MSFT_ImpFile*)&This->typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES][impinfo->oImpFile]; guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][impinfo->oGuid]; @@ -2990,7 +3017,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeInfo( int i = 0; for(iter=This->typelib->typeinfos; iter; iter=iter->next_typeinfo) { - if(This->typelib->typelib_typeinfo_offsets[i] == hRefType) { + if(This->typelib->typelib_typeinfo_offsets[i] == (hRefType&(~0x3))) { *ppTInfo = (ITypeInfo*)&iter->lpVtblTypeInfo2; ITypeLib_AddRef(*ppTInfo);

1 0

Piotr Caban : oleaut32: Added implementation of ITypeInfo2_GetImplTypeFlags .
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

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