January 2011 - Wine-Commits

Nikolay Sivov : msxml3/tests: Fix a lot of leaks in tests (Valgrind).
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: f6ce8b71969df87e1c6dce14ad9c17e0ff77ce22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ce8b71969df87e1c6dce14a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 16 03:32:00 2011 +0300 msxml3/tests: Fix a lot of leaks in tests (Valgrind). --- dlls/msxml3/tests/domdoc.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d821bac..527b46d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1809,12 +1809,14 @@ todo_wine ok ( str != NULL, "str is null\n"); ok( !lstrcmpW( str, szdl ), "incorrect node name\n"); SysFreeString( str ); + IXMLDOMNode_Release( node ); /* test sequential access of attributes */ node = NULL; r = IXMLDOMNamedNodeMap_nextNode( map, &node ); ok ( r == S_OK, "nextNode (first time) wrong code\n"); ok ( node != NULL, "nextNode, should be attribute\n"); + IXMLDOMNode_Release( node ); r = IXMLDOMNamedNodeMap_nextNode( map, &node ); ok ( r != S_OK, "nextNode (second time) wrong code\n"); @@ -2977,6 +2979,7 @@ static void test_removeChild(void) r = IXMLDOMElement_removeChild( element, fo_node, &temp_node ); ok( r == E_INVALIDARG, "ret %08x\n", r); ok( temp_node == NULL, "%p\n", temp_node ); + IXMLDOMNode_Release( fo_node ); /* the removed node has no parent anymore */ r = IXMLDOMNode_get_parentNode( removed_node, &temp_node ); @@ -2996,6 +2999,7 @@ static void test_removeChild(void) /* MS quirk: passing wrong interface pointer works, too */ r = IXMLDOMElement_removeChild( element, (IXMLDOMNode*)lc_element, NULL ); ok( r == S_OK, "ret %08x\n", r); + IXMLDOMElement_Release( lc_element ); r = IXMLDOMNode_get_parentNode( lc_node, &temp_node ); ok( r == S_FALSE, "ret %08x\n", r); @@ -3065,6 +3069,7 @@ static void test_replaceChild(void) r = IXMLDOMElement_replaceChild( element, lc_node, ba_node, &removed_node ); ok( r == E_INVALIDARG, "ret %08x\n", r ); ok( removed_node == NULL, "%p\n", removed_node ); + IXMLDOMNode_Release( lc_node ); /* invalid parameter: would create loop */ removed_node = (void*)0xdeadbeef; @@ -3100,6 +3105,7 @@ static void test_replaceChild(void) r = IXMLDOMElement_replaceChild( element, ba_node, (IXMLDOMNode*)ba_element, &removed_node ); ok( r == S_OK, "ret %08x\n", r ); + IXMLDOMElement_Release( ba_element ); r = IXMLDOMNodeList_get_length( fo_list, &len); ok( r == S_OK, "ret %08x\n", r ); @@ -5622,6 +5628,7 @@ static void test_DocumentSaveToDocument(void) SysFreeString(sOrig); SysFreeString(sNew); } + IXMLDOMElement_Release(pRoot); } IXMLDOMDocument_Release(doc2); @@ -6591,8 +6598,7 @@ static void test_XSLPattern(void) len = 0; ole_check(IXMLDOMNodeList_get_length(list, &len)); ok(len == 0, "expected empty list\n"); - if (len) - IXMLDOMNodeList_Release(list); + IXMLDOMNodeList_Release(list); ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:c"), &list)); len = 0; @@ -6620,8 +6626,7 @@ static void test_XSLPattern(void) len = 0; ole_check(IXMLDOMNodeList_get_length(list, &len)); ok(len == 0, "expected empty list\n"); - if (len) - IXMLDOMNodeList_Release(list); + IXMLDOMNodeList_Release(list); IXMLDOMDocument2_Release(doc); @@ -6637,29 +6642,25 @@ static void test_XSLPattern(void) len = 0; ole_check(IXMLDOMNodeList_get_length(list, &len)); ok(len == 0, "expected empty list\n"); - if (len) - IXMLDOMNodeList_Release(list); + IXMLDOMNodeList_Release(list); ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("attribute('depth')"), &list)); len = 0; ole_check(IXMLDOMNodeList_get_length(list, &len)); ok(len == 0, "expected empty list\n"); - if (len) - IXMLDOMNodeList_Release(list); + IXMLDOMNodeList_Release(list); ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root/attribute('depth')"), &list)); len = 0; ole_check(IXMLDOMNodeList_get_length(list, &len)); ok(len != 0, "expected filled list\n"); - if (len) - expect_list_and_release(list, "A'depth'.E3.D1"); + expect_list_and_release(list, "A'depth'.E3.D1"); ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x/attribute()"), &list)); len = 0; ole_check(IXMLDOMNodeList_get_length(list, &len)); ok(len != 0, "expected filled list\n"); - if (len) - expect_list_and_release(list, "A'id'.E3.E3.D1 A'depth'.E3.E3.D1"); + expect_list_and_release(list, "A'id'.E3.E3.D1 A'depth'.E3.E3.D1"); list = NULL; ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x//attribute(id)"), &list), E_FAIL); @@ -7184,7 +7185,7 @@ static void test_get_ownerDocument(void) check_default_props(doc_owner); check_default_props(doc); - + IXMLDOMSchemaCollection_Release(cache); IXMLDOMDocument_Release(doc1); IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc3); @@ -7608,6 +7609,7 @@ static void test_put_nodeTypedValue(void) "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type))); VariantClear(&type); + IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); free_bstrs(); } @@ -7655,6 +7657,7 @@ static void test_get_xml(void) SysFreeString(xml); IXMLDOMDocument_Release(doc); + free_bstrs(); } START_TEST(domdoc)

1 0

Greg Geldorp : msctf/tests: Fix failures on Win7 and East-Asian machines.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: e8ac4271437af1d997cc8e0edf1c4b7a5eebd38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ac4271437af1d997cc8e0ed… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sat Jan 15 22:54:20 2011 +0100 msctf/tests: Fix failures on Win7 and East-Asian machines. --- dlls/msctf/tests/inputprocessor.c | 115 +++++++++++++++++++++++++++++------- 1 files changed, 92 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8ac4271437af1d997cc8…

1 0

David Hedberg : shell32: Fix a leak in the ebrowser travellog (Valgrind).
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 8cf1200fff9642d1704a0af18f40b73f29423137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf1200fff9642d1704a0af18… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jan 16 10:57:00 2011 +0100 shell32: Fix a leak in the ebrowser travellog (Valgrind). --- dlls/shell32/ebrowser.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index ea44337..98643b3 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -181,6 +181,7 @@ static void travellog_remove_entry(ExplorerBrowserImpl *This, travellog_entry *e TRACE("Removing %p\n", entry); list_remove(&entry->entry); + ILFree(entry->pidl); HeapFree(GetProcessHeap(), 0, entry); This->travellog_count--; }

1 0

David Hedberg : shell32/tests: Fix a leak in the ebrowser tests (Valgrind).
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 9fd1e23602c489134de9643001cd526f214f4a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd1e23602c489134de964300… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jan 16 10:57:01 2011 +0100 shell32/tests: Fix a leak in the ebrowser tests (Valgrind). --- dlls/shell32/tests/ebrowser.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 6d9dbb1..a8da1cc 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -94,8 +94,11 @@ static HRESULT ebrowser_initialize(IExplorerBrowser *peb) static HRESULT ebrowser_browse_to_desktop(IExplorerBrowser *peb) { LPITEMIDLIST pidl_desktop; + HRESULT hr; SHGetSpecialFolderLocation (hwnd, CSIDL_DESKTOP, &pidl_desktop); - return IExplorerBrowser_BrowseToIDList(peb, pidl_desktop, 0); + hr = IExplorerBrowser_BrowseToIDList(peb, pidl_desktop, 0); + ILFree(pidl_desktop); + return hr; } /* Process some messages */

1 0

Greg Geldorp : comdlg32/tests: Fix expected height computation.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 4d7e73397d7db655e07ea2858c82f9505ff56d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7e73397d7db655e07ea2858… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 16 19:44:12 2011 +0100 comdlg32/tests: Fix expected height computation. --- dlls/comdlg32/tests/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 3b4a92f..0320e7e 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -765,7 +765,7 @@ static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa /* special case: there is a control with id stc32 */ /* expected height */ expecty = posz0[withhelp].cy; - if( rcStc32.bottom - rcStc32.top > clrcParent.bottom) { + if( rcStc32.bottom - rcStc32.top + (withhelp ? 0 : fixhelp) > clrcParent.bottom) { expecty += clrcChild.bottom - clrcParent.bottom; if( !withhelp) expecty += fixhelp; }

1 0

Vincent Povirk : gdiplus: Rewrite GdipCreateMatrix3.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: d7379712e7cf65b99e7d44f1232edad796043abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7379712e7cf65b99e7d44f12… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Jan 16 10:59:50 2011 -0600 gdiplus: Rewrite GdipCreateMatrix3. --- dlls/gdiplus/matrix.c | 16 ++++++++-------- dlls/gdiplus/tests/matrix.c | 36 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index a6724d3..3798bd2 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -85,20 +85,20 @@ GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *rect, GDIPCONST GpPointF *pt, GpMatrix **matrix) { + REAL m11, m12, m21, m22, dx, dy; TRACE("(%p, %p, %p)\n", rect, pt, matrix); if(!matrix || !pt) return InvalidParameter; - *matrix = GdipAlloc(sizeof(GpMatrix)); - if(!*matrix) return OutOfMemory; - - memcpy((*matrix)->matrix, rect, 4 * sizeof(REAL)); + m11 = (pt[1].X - pt[0].X) / rect->Width; + m21 = (pt[2].X - pt[0].X) / rect->Height; + dx = pt[0].X - m11 * rect->X - m21 * rect->Y; + m12 = (pt[1].Y - pt[0].Y) / rect->Width; + m22 = (pt[2].Y - pt[0].Y) / rect->Height; + dy = pt[0].Y - m12 * rect->X - m22 * rect->Y; - (*matrix)->matrix[4] = pt->X; - (*matrix)->matrix[5] = pt->Y; - - return Ok; + return GdipCreateMatrix2(m11, m12, m21, m22, dx, dy, matrix); } GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint *pt, diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index b9992c3..cf8f158 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -249,12 +249,12 @@ static void test_constructor3(void) stat = GdipGetMatrixElements(matrix, values); expect(Ok, stat); - todo_wine expectf(1.0, values[0]); - todo_wine expectf(0.0, values[1]); - todo_wine expectf(0.0, values[2]); - todo_wine expectf(1.0, values[3]); - todo_wine expectf(0.0, values[4]); - todo_wine expectf(0.0, values[5]); + expectf(1.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); GdipDeleteMatrix(matrix); @@ -271,12 +271,12 @@ static void test_constructor3(void) stat = GdipGetMatrixElements(matrix, values); expect(Ok, stat); - todo_wine expectf(2.0, values[0]); - todo_wine expectf(0.0, values[1]); - todo_wine expectf(0.0, values[2]); - todo_wine expectf(1.0, values[3]); - todo_wine expectf(0.0, values[4]); - todo_wine expectf(0.0, values[5]); + expectf(2.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); GdipDeleteMatrix(matrix); @@ -293,12 +293,12 @@ static void test_constructor3(void) stat = GdipGetMatrixElements(matrix, values); expect(Ok, stat); - todo_wine expectf(1.0, values[0]); - todo_wine expectf(1.0, values[1]); - todo_wine expectf(0.0, values[2]); - todo_wine expectf(1.0, values[3]); - todo_wine expectf(0.0, values[4]); - todo_wine expectf(0.0, values[5]); + expectf(1.0, values[0]); + expectf(1.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); GdipDeleteMatrix(matrix);}

1 0

Thomas Mullaly : urlmon/tests: Fixed memory leak in tests (valgrind).
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: c63cf7014bcc22366834e916302385b257ca61cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63cf7014bcc22366834e9163… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Jan 15 15:16:50 2011 -0500 urlmon/tests: Fixed memory leak in tests (valgrind). --- dlls/urlmon/tests/uri.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 44f438f..5bbd051 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7248,6 +7248,7 @@ static void test_CreateUriWithFragment(void) { if(uri) IUri_Release(uri); heap_free(uriW); + heap_free(fragW); } }

1 0

Francois Gouget : ntdll/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 2df9129c52e52563f7528d026932e9aa2b3297a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df9129c52e52563f7528d026… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 15 20:10:26 2011 +0100 ntdll/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e8f23e0..aa599ed 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -837,7 +837,7 @@ static void append_file_test(void) return; } - iosb.Status = STATUS_PENDING; + U(iosb).Status = STATUS_PENDING; iosb.Information = 0; status = NtWriteFile(handle, NULL, NULL, NULL, &iosb, @@ -846,7 +846,7 @@ static void append_file_test(void) if (status == STATUS_PENDING) { WaitForSingleObject( handle, INFINITE ); - status = iosb.Status; + status = U(iosb).Status; } written = iosb.Information;

1 0

Thomas Mullaly : normaliz: Changed the default debug channel to normaliz instead of authz.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 33fcb5b5f475468151c454db9d2de3983ace873a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33fcb5b5f475468151c454db9… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jan 11 19:49:59 2011 -0500 normaliz: Changed the default debug channel to normaliz instead of authz. --- dlls/normaliz/normaliz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/normaliz/normaliz.c b/dlls/normaliz/normaliz.c index c00df40..e6d06c5 100644 --- a/dlls/normaliz/normaliz.c +++ b/dlls/normaliz/normaliz.c @@ -29,7 +29,7 @@ #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(authz); +WINE_DEFAULT_DEBUG_CHANNEL(normaliz); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

Thomas Mullaly : urlmon: Fixed misc typos and removed a few random tab characters.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 81d6e7443a3198fcfc9b1ce7a00a4ab2a3823664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d6e7443a3198fcfc9b1ce7a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jan 11 19:48:45 2011 -0500 urlmon: Fixed misc typos and removed a few random tab characters. --- dlls/urlmon/uri.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 7f8a441..206fa6b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -258,11 +258,11 @@ static Uri *get_uri_obj(IUri *uri) } static inline BOOL is_alpha(WCHAR val) { - return ((val >= 'a' && val <= 'z') || (val >= 'A' && val <= 'Z')); + return ((val >= 'a' && val <= 'z') || (val >= 'A' && val <= 'Z')); } static inline BOOL is_num(WCHAR val) { - return (val >= '0' && val <= '9'); + return (val >= '0' && val <= '9'); } static inline BOOL is_drive_path(const WCHAR *str) { @@ -614,7 +614,7 @@ static const WCHAR *str_last_of(const WCHAR *str, const WCHAR *end, WCHAR ch) { * a valid domain name it will assign 'domain_start' the offset * into 'host' where the domain name starts. * - * It's implied that if a domain name its range is implied to be + * It's implied that if there is a domain name its range is: * [host+domain_start, host+host_len). */ static void find_domain_name(const WCHAR *host, DWORD host_len, @@ -809,12 +809,12 @@ static INT find_file_extension(const WCHAR *path, DWORD path_len) { * * NOTES: * Windows will expand an elision if the elision only represents 1 h16 - * component of the URI. + * component of the address. * * Ex: [1::2:3:4:5:6:7] -> [1:0:2:3:4:5:6:7] * * If the IPv6 address contains an IPv4 address, the IPv4 address is also - * considered for being included as part of an elision if all it's components + * considered for being included as part of an elision if all its components * are zeros. * * Ex: [1:2:3:4:5:6:0.0.0.0] -> [1:2:3:4:5:6::] @@ -987,7 +987,7 @@ static USHORT h16tous(h16 component) { return ret; } -/* Converts an IPv6 address into it's 128 bits (16 bytes) numerical value. +/* Converts an IPv6 address into its 128 bits (16 bytes) numerical value. * * This function assumes that the ipv6_address has already been validated. */ @@ -998,7 +998,7 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { for(i = 0; i < address->h16_count; ++i) { if(address->elision) { if(address->components[i].str > address->elision && !already_passed_elision) { - /* Means we just passed the elision and need to add it's values to + /* Means we just passed the elision and need to add its values to * 'number' before we do anything else. */ DWORD j = 0;

1 0