November 2015 - Wine-commits

Alistair Leslie-Hughes : configure: Correctly detect OpenAL.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 8454e2352970463f65f3aebef32f6352198e62b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8454e2352970463f65f3aebef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 19 17:47:59 2015 +1100 configure: Correctly detect OpenAL. Older OpenAL alext.h doesn't include al.h/alc.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a35d96c..291966b 100755 --- a/configure +++ b/configure @@ -13694,6 +13694,8 @@ if ${ac_cv_have_openalsoft+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include <AL/al.h> +#include <AL/alc.h> #include <AL/alext.h> LPALCRENDERSAMPLESSOFT x; int diff --git a/configure.ac b/configure.ac index cd97d62..bd3db26 100644 --- a/configure.ac +++ b/configure.ac @@ -1650,7 +1650,9 @@ if test "x$ac_cv_lib_openal" = xyes then AC_CACHE_CHECK([for openal-soft], ac_cv_have_openalsoft, AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <AL/alext.h> + [[#include <AL/al.h> +#include <AL/alc.h> +#include <AL/alext.h> LPALCRENDERSAMPLESSOFT x;]])],[ac_cv_have_openalsoft=yes],[ac_cv_have_openalsoft=no])) fi if test "x$ac_cv_have_openalsoft" != xyes

1 0

Alexandre Julliard : user32/tests: Fix a test that assumes that a menu handle is invalid.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 869380543192f12fb565d55f09e481ff302c5817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=869380543192f12fb565d55f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 20:03:20 2015 +0900 user32/tests: Fix a test that assumes that a menu handle is invalid. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7599431..00fcfc1 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3789,6 +3789,8 @@ static void test_AppendMenu(void) mii.cbSize = sizeof(mii); mii.fMask = MIIM_SUBMENU; mii.hSubMenu = (HMENU)204; + /* make sure the menu handle is truly invalid */ + while (IsMenu( mii.hSubMenu )) mii.hSubMenu = (HMENU)((ULONG_PTR)mii.hSubMenu + 1); ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); ok(!ret, "InsertMenuItem should fail\n"); ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);

1 0

Alexandre Julliard : user32: Add workaround for removed SC_TASKLIST system menu item.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: c82626a4c1fe8e941ab1dc61053d98dcb8e16887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82626a4c1fe8e941ab1dc610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 20:54:34 2015 +0900 user32: Add workaround for removed SC_TASKLIST system menu item. Word 95 assumes that the item exists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 27 +++++-- dlls/user32/tests/menu.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 209 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c82626a4c1fe8e941ab1d…

1 0

Francois Gouget : msvcp120/tests: Make i386_Thrd_current() static.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 7740fa69ef375d504f6e8aa03115818b1ee87646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7740fa69ef375d504f6e8aa03… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 14:59:13 2015 +0100 msvcp120/tests: Make i386_Thrd_current() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index e69405f..12ca12d 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -150,7 +150,7 @@ static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); #ifdef __i386__ static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); -_Thrd_t __cdecl i386_Thrd_current(void) +static _Thrd_t __cdecl i386_Thrd_current(void) { union { _Thrd_t thr;

1 0

Piotr Caban : msxml3/tests: Add more IXMLDOMNode_get_text tests.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 4386cac6cad601fb8afb97b65ebc08d9f6151dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4386cac6cad601fb8afb97b65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:21 2015 +0100 msxml3/tests: Add more IXMLDOMNode_get_text tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b563a80..5518494 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description. <bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4200,11 +4200,11 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - helper_expect_bstr_and_release(bstr, str); + todo_wine helper_expect_bstr_and_release(bstr, str); } else { - helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1);

1 0

Piotr Caban : msxml3/tests: Add tests for sub-nodes whitespaces trimming while getting node text.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 80df8c03e23a2831bd7154a595341d41028e386c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80df8c03e23a2831bd7154a59… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:38 2015 +0100 msxml3/tests: Add tests for sub-nodes whitespaces trimming while getting node text. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5518494..835ddd5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description. <bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4171,7 +4171,7 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const } else { - helper_expect_bstr_and_release(bstr, "This is a description."); + todo_wine helper_expect_bstr_and_release(bstr, "This is a description."); } IXMLDOMNode_Release(node1);

1 0

Piotr Caban : msxml3/tests: Show that sub-elements should not be divided with ' ' in IXMLDOMNode_get_text.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: fa01cd0880c7499f7bd6723b27f3c3816f027835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa01cd0880c7499f7bd6723b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:55:48 2015 +0100 msxml3/tests: Show that sub-elements should not be divided with ' ' in IXMLDOMNode_get_text. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 835ddd5..10e5d55 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" This is a description<dot>. </dot><bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4163,11 +4163,11 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 T4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); + helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - helper_expect_bstr_and_release(bstr, str); + todo_wine helper_expect_bstr_and_release(bstr, str); } else { @@ -4196,7 +4196,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); + helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 E5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4204,7 +4204,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con } else { - helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1);

1 0

Piotr Caban : msxml3/tests: Add CDATA block to whitespace trimming tests.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: ef127caef2206a6a1935a4b7335bc43dfe1a8e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef127caef2206a6a1935a4b73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 18 12:56:01 2015 +0100 msxml3/tests: Add CDATA block to whitespace trimming tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 10e5d55..c894361 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -481,7 +481,7 @@ static const char szExampleXML[] = " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description<dot>. </dot><bar:x/>\n" +" <![CDATA[]]> This is a description<dot>. </dot><bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -4163,7 +4163,9 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); + helper_expect_list_and_release(list, + "[4]1.E1.E5.E1.E2.D1 T2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 " + "E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1 E6.E1.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4171,7 +4173,7 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const } else { - todo_wine helper_expect_bstr_and_release(bstr, "This is a description."); + todo_wine helper_expect_bstr_and_release(bstr, " This is a description."); } IXMLDOMNode_Release(node1); @@ -4196,7 +4198,10 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 E5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); + helper_expect_list_and_release(list, + "T1.E2.E10.E2.E2.D1 [4]2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 " + "E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 " + "E7.E2.E10.E2.E2.D1 E8.E2.E10.E2.E2.D1 T9.E2.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -4204,7 +4209,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con } else { - todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1); @@ -4311,8 +4316,8 @@ static void test_whitespace(void) ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE)); /* the trailing "\n " isn't there, because it was ws-only node */ - check_ws_ignored(doc1, "\n This is a description. "); - check_ws_preserved(doc2, "This is a description."); + check_ws_ignored(doc1, " This is a description. "); + check_ws_preserved(doc2, " This is a description."); /* it takes effect on reload */ ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); @@ -4602,7 +4607,7 @@ if (0) ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - expect_list_and_release(list, "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); + expect_list_and_release(list, "E6.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -6894,7 +6899,7 @@ static const xslpattern_test_t xslpattern_test[] = { static const xslpattern_test_t xslpattern_test_no_ns[] = { /* prefixes don't need to be registered, you may use them as they are in the doc */ - { "//bar:x", "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, + { "//bar:x", "E6.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, /* prefixes must be explicitly specified in the name */ { "//foo:elem", "" }, { "//foo:c", "E3.E4.E2.D1" },

1 0

Jacek Caban : mshtml: Added support for getElementsByTagName in document fragment nodes.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 808c2d6c7fefb38fe50357749439ea9af9c2cf48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808c2d6c7fefb38fe50357749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 12:14:59 2015 +0100 mshtml: Added support for getElementsByTagName in document fragment nodes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 46 +++++++++++++++++++++++++++++++++++---------- dlls/mshtml/tests/dom.c | 50 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8e53b8b..cdeb371 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2371,19 +2371,45 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } + if(This->doc_node->nsdoc) { + nsAString_InitDepend(&id_str, v); + nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); + nsAString_Finish(&id_str); + if(FAILED(nsres)) { + ERR("GetElementByName failed: %08x\n", nsres); + return E_FAIL; + } + }else { + nsIDOMDocumentFragment *docfrag; + nsAString nsstr; + + if(v) { + const WCHAR *ptr; + for(ptr=v; *ptr; ptr++) { + if(!isalnumW(*ptr)) { + FIXME("Unsupported invalid tag %s\n", debugstr_w(v)); + return E_NOTIMPL; + } + } + } - nsAString_InitDepend(&id_str, v); - nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); - nsAString_Finish(&id_str); - if(FAILED(nsres)) { - ERR("GetElementByName failed: %08x\n", nsres); - return E_FAIL; + nsres = nsIDOMNode_QueryInterface(This->doc_node->node.nsnode, &IID_nsIDOMDocumentFragment, (void**)&docfrag); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMDocumentFragment iface: %08x\n", nsres); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMDocumentFragment_QuerySelectorAll(docfrag, &nsstr, &nslist); + nsAString_Finish(&nsstr); + nsIDOMDocumentFragment_Release(docfrag); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } } + *pelColl = create_collection_from_nodelist(This->doc_node, nslist); nsIDOMNodeList_Release(nslist); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 896e6ad..bc60ff0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2693,6 +2693,35 @@ static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t ty IHTMLElementCollection_Release(col); } +#define test_doc_getelembytag(a,b,c,d) _test_doc_getelembytag(__LINE__,a,b,c,d) +static void _test_doc_getelembytag(unsigned line, IHTMLDocument2 *unk, const char *tag, elem_type_t type, LONG exlen) +{ + IHTMLDocument3 *doc = _get_doc3_iface(line, unk); + IHTMLElementCollection *col = NULL; + elem_type_t *types = NULL; + BSTR tmp; + int i; + HRESULT hres; + + tmp = a2bstr(elem_type_infos[type].tag); + hres = IHTMLDocument3_getElementsByTagName(doc, tmp, &col); + SysFreeString(tmp); + ok_(__FILE__,line) (hres == S_OK, "getElementByTagName failed: %08x\n", hres); + ok_(__FILE__,line) (col != NULL, "col == NULL\n"); + + if(exlen) { + types = HeapAlloc(GetProcessHeap(), 0, exlen*sizeof(elem_type_t)); + for(i=0; i<exlen; i++) + types[i] = type; + } + + _test_elem_collection(line, (IUnknown*)col, types, exlen); + + HeapFree(GetProcessHeap(), 0, types); + IHTMLElementCollection_Release(col); + IHTMLDocument3_Release(doc); +} + #define test_elem_innertext(e,t) _test_elem_innertext(__LINE__,e,t) static void _test_elem_innertext(unsigned line, IHTMLElement *elem, const char *extext) { @@ -8283,20 +8312,7 @@ static void test_elems(IHTMLDocument2 *doc) } IDispatch_Release(disp); - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - - str = a2bstr("Img"); - hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); - ok(hres == S_OK, "getElementsByTagName(%s) failed: %08x\n", wine_dbgstr_w(str), hres); - SysFreeString(str); - if(hres == S_OK) - { - static const elem_type_t img_types[] = { ET_IMG }; - - test_elem_collection((IUnknown*)col, img_types, sizeof(img_types)/sizeof(img_types[0])); - IHTMLElementCollection_Release(col); - } + test_doc_getelembytag(doc, "Img", ET_IMG, 1); elem = get_doc_elem_by_id(doc, "y"); test_elem_set_innerhtml((IUnknown*)elem, "inner html"); @@ -8313,6 +8329,9 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); IHTMLElement_Release(elem); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + hres = IHTMLDocument3_recalc(doc3, VARIANT_TRUE); ok(hres == S_OK, "recalc failed: %08x\n", hres); @@ -9263,6 +9282,9 @@ static void test_docfrag(IHTMLDocument2 *doc) test_elem_source_index(br, 0); IHTMLElement_Release(br); + test_doc_getelembytag(frag, "a", ET_A, 0); + test_doc_getelembytag(frag, "Br", ET_BR, 1); + div = get_elem_by_id(doc, "divid", TRUE); test_node_append_child((IUnknown*)div, (IUnknown*)frag); IHTMLElement_Release(div);

1 0

Jacek Caban : ntdll: Added more NtOpenKey tests.
by Alexandre Julliard 19 Nov '15

19 Nov '15

Module: wine Branch: master Commit: 26df0863ca6d57c2d5ce24b79a5cd9f5e711ae83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26df0863ca6d57c2d5ce24b79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 12:48:22 2015 +0100 ntdll: Added more NtOpenKey tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0e00f99..e688fd2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -340,6 +340,7 @@ static void test_NtOpenKey(void) NTSTATUS status; OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_READ; + UNICODE_STRING str; /* All NULL */ status = pNtOpenKey(NULL, 0, NULL); @@ -361,6 +362,27 @@ static void test_NtOpenKey(void) status = pNtOpenKey(&key, am, &attr); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); + /* Calling without parent key requres full registry path. */ + pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); + InitializeObjectAttributes(&attr, &str, 0, 0, 0); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + + /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + + attr.Attributes = OBJ_CASE_INSENSITIVE; + status = pNtOpenKey(&key, KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + if (!status) + pNtClose(key); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n");

1 0