September 2017 - Wine-Commits

Nikolay Sivov : usp10/tests: Remove special itemization failure test that doesn't happen.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 9e9f5aad84a00f8859fbc107d7bc735497db981e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e9f5aad84a00f8859fbc107d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 20:15:31 2017 +0300 usp10/tests: Remove special itemization failure test that doesn't happen. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f0eb500..54d7ba7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -992,14 +992,6 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_ok(SUCCEEDED(hr), "Failed to get script properties, hr %#x.\n", hr); hr = pScriptItemizeOpenType(string, cchString, 15, Control, State, outpItems, tags, &outnItems); - if (hr == USP_E_SCRIPT_NOT_IN_FONT) - { - if (valid > 0) - winetest_win_skip("Select font does not support script\n"); - else - winetest_trace("Select font does not support script\n"); - return; - } if (valid > 0) winetest_ok(hr == S_OK, "ScriptItemizeOpenType should return S_OK not %08x\n", hr); else if (hr != S_OK)

1 0

Jacek Caban : mshtml: Added implementation of IHTMLDocument7 event handler properties for supported events.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 8546c6a55b4cb7bf288f00749f4da19c07c5e0fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8546c6a55b4cb7bf288f00749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:14:57 2017 +0200 mshtml: Added implementation of IHTMLDocument7 event handler properties for supported events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 84 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d3cc06f..357dbcf 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3444,29 +3444,37 @@ static HRESULT WINAPI HTMLDocument7_hasAttributes(IHTMLDocument7 *iface, VARIANT static HRESULT WINAPI HTMLDocument7_put_onabort(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_ABORT, &v); } static HRESULT WINAPI HTMLDocument7_get_onabort(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_ABORT, p); } static HRESULT WINAPI HTMLDocument7_put_onblur(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_BLUR, &v); } static HRESULT WINAPI HTMLDocument7_get_onblur(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_BLUR, p); } static HRESULT WINAPI HTMLDocument7_put_oncanplay(IHTMLDocument7 *iface, VARIANT v) @@ -3500,15 +3508,19 @@ static HRESULT WINAPI HTMLDocument7_get_oncanplaythrough(IHTMLDocument7 *iface, static HRESULT WINAPI HTMLDocument7_put_onchange(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_CHANGE, &v); } static HRESULT WINAPI HTMLDocument7_get_onchange(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_CHANGE, p); } static HRESULT WINAPI HTMLDocument7_put_ondrag(IHTMLDocument7 *iface, VARIANT v) @@ -3644,29 +3656,37 @@ static HRESULT WINAPI HTMLDocument7_get_onended(IHTMLDocument7 *iface, VARIANT * static HRESULT WINAPI HTMLDocument7_put_onerror(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_ERROR, &v); } static HRESULT WINAPI HTMLDocument7_get_onerror(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_ERROR, p); } static HRESULT WINAPI HTMLDocument7_put_onfocus(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_FOCUS, &v); } static HRESULT WINAPI HTMLDocument7_get_onfocus(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_FOCUS, p); } static HRESULT WINAPI HTMLDocument7_put_oninput(IHTMLDocument7 *iface, VARIANT v) @@ -3686,15 +3706,19 @@ static HRESULT WINAPI HTMLDocument7_get_oninput(IHTMLDocument7 *iface, VARIANT * static HRESULT WINAPI HTMLDocument7_put_onload(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLDocument7_get_onload(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLDocument7_put_onloadeddata(IHTMLDocument7 *iface, VARIANT v) @@ -3900,15 +3924,19 @@ static HRESULT WINAPI HTMLDocument7_get_onstalled(IHTMLDocument7 *iface, VARIANT static HRESULT WINAPI HTMLDocument7_put_onsubmit(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_SUBMIT, &v); } static HRESULT WINAPI HTMLDocument7_get_onsubmit(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_SUBMIT, p); } static HRESULT WINAPI HTMLDocument7_put_onsuspend(IHTMLDocument7 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Forward common function from IHTMLDocument7 to IHTMLDocument2.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 3c92286b5460eadafe382f50648569884bd1b9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c92286b5460eadafe382f506… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:14:43 2017 +0200 mshtml: Forward common function from IHTMLDocument7 to IHTMLDocument2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ea6bb20..d3cc06f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3332,15 +3332,19 @@ static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR static HRESULT WINAPI HTMLDocument7_createElement(IHTMLDocument7 *iface, BSTR bstrTag, IHTMLElement **newElem) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrTag), newElem); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrTag), newElem); + + return IHTMLDocument2_createElement(&This->IHTMLDocument2_iface, bstrTag, newElem); } static HRESULT WINAPI HTMLDocument7_createAttribute(IHTMLDocument7 *iface, BSTR bstrAttrName, IHTMLDOMAttribute **ppAttribute) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrAttrName), ppAttribute); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrAttrName), ppAttribute); + + return IHTMLDocument5_createAttribute(&This->IHTMLDocument5_iface, bstrAttrName, ppAttribute); } static HRESULT WINAPI HTMLDocument7_getElementByClassName(IHTMLDocument7 *iface, BSTR v, IHTMLElementCollection **pel) @@ -3382,8 +3386,10 @@ static HRESULT WINAPI HTMLDocument7_get_onmssitemodejumplistitemremoved(IHTMLDoc static HRESULT WINAPI HTMLDocument7_get_all(IHTMLDocument7 *iface, IHTMLElementCollection **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDocument2_get_all(&This->IHTMLDocument2_iface, p); } static HRESULT WINAPI HTMLDocument7_get_inputEncoding(IHTMLDocument7 *iface, BSTR *p) @@ -3995,8 +4001,10 @@ static HRESULT WINAPI HTMLDocument7_put_body(IHTMLDocument7 *iface, IHTMLElement static HRESULT WINAPI HTMLDocument7_get_body(IHTMLDocument7 *iface, IHTMLElement **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDocument2_get_body(&This->IHTMLDocument2_iface, p); } static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement **p)

1 0

Alexandre Julliard : ntdll: Get rid of the VPROT_VALLOC flag.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: b8d0a59a2e3df408ec18b16c59c24a261586386c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d0a59a2e3df408ec18b16c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 12:59:28 2017 +0200 ntdll: Get rid of the VPROT_VALLOC flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e1fe409..ce24698 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -84,7 +84,6 @@ struct file_view #define VPROT_WRITEWATCH 0x40 /* per-mapping protection flags */ #define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ -#define VPROT_VALLOC 0x0400 /* allocated by VirtualAlloc */ /* Conversion from VPROT_* to Win32 flags */ static const BYTE VIRTUAL_Win32Flags[16] = @@ -169,6 +168,10 @@ static void *preload_reserve_end; static BOOL use_locks; static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */ +static inline int is_view_valloc( const struct file_view *view ) +{ + return !(view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)); +} /*********************************************************************** * get_page_vprot @@ -897,7 +900,7 @@ static NTSTATUS set_protection( struct file_view *view, void *base, SIZE_T size, NTSTATUS status; if ((status = get_vprot_flags( protect, &vprot, view->protect & SEC_IMAGE ))) return status; - if (view->protect & VPROT_VALLOC) + if (is_view_valloc( view )) { if (vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; } @@ -1712,7 +1715,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi server_enter_uninterrupted_section( &csVirtual, &sigset ); if ((status = map_view( &view, NULL, size, 0xffff, 0, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_VALLOC )) != STATUS_SUCCESS) + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER @@ -2172,7 +2175,6 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ { if (!(status = get_vprot_flags( protect, &vprot, FALSE ))) { - vprot |= VPROT_VALLOC; if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED; if (type & MEM_WRITE_WATCH) vprot |= VPROT_WRITEWATCH; if (protect & PAGE_NOCACHE) vprot |= SEC_NOCACHE; @@ -2266,7 +2268,7 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (!(view = VIRTUAL_FindView( base, size )) || !(view->protect & VPROT_VALLOC)) + if (!(view = VIRTUAL_FindView( base, size )) || !is_view_valloc( view )) { status = STATUS_INVALID_PARAMETER; } @@ -2547,8 +2549,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, info->Protect = (vprot & VPROT_COMMITTED) ? VIRTUAL_GetWin32Prot( vprot, view->protect ) : 0; info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect, view->protect ); if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; - else if (view->protect & VPROT_VALLOC) info->Type = MEM_PRIVATE; - else info->Type = MEM_MAPPED; + else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; + else info->Type = MEM_PRIVATE; for (ptr = base; ptr < base + range_size; ptr += page_size) if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; info->RegionSize = ptr - base; @@ -2927,7 +2929,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) } server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( addr, 0 )) && !(view->protect & VPROT_VALLOC)) + if ((view = VIRTUAL_FindView( addr, 0 )) && !is_view_valloc( view )) { delete_view( view ); status = STATUS_SUCCESS; @@ -3210,7 +3212,7 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) if (!view1 || !view2) status = STATUS_INVALID_ADDRESS; - else if ((view1->protect & VPROT_VALLOC) || (view2->protect & VPROT_VALLOC)) + else if (is_view_valloc( view1 ) || is_view_valloc( view2 )) status = STATUS_CONFLICTING_ADDRESSES; else if (view1 == view2) status = STATUS_SUCCESS;

1 0

Alexandre Julliard : ntdll: Verify page protection against the mapping protections in VirtualAlloc and VirtualProtect.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: f448be618bbb752dd7747086db36465834805186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f448be618bbb752dd7747086d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 10:57:07 2017 +0200 ntdll: Verify page protection against the mapping protections in VirtualAlloc and VirtualProtect. This partially reverts 3a5ee02735d49a808f3f3fc3a3f39d8e14089a52. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 4 -- dlls/kernel32/tests/virtual.c | 11 +--- dlls/ntdll/virtual.c | 134 +++++++++++++++++------------------------- 3 files changed, 55 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f448be618bbb752dd7747…

1 0

Alexandre Julliard : ntdll: Fix access rights checks for mapping objects.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 94872cc84fc92a38f9009e4aa36740474781cfae URL: http://source.winehq.org/git/wine.git/?a=commit;h=94872cc84fc92a38f9009e4aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 10:33:33 2017 +0200 ntdll: Fix access rights checks for mapping objects. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 16 +++++----------- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/virtual.c | 10 ++++++---- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 46b019c..1201863 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3710,16 +3710,16 @@ static DWORD map_prot_to_access(DWORD prot) switch (prot) { case PAGE_READWRITE: - return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_QUERY; + return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_QUERY; case PAGE_EXECUTE_READWRITE: - return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT | SECTION_QUERY; + return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_QUERY; case PAGE_READONLY: case PAGE_WRITECOPY: - return SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_QUERY; + return SECTION_MAP_READ | SECTION_QUERY; case PAGE_EXECUTE: case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: - return SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT | SECTION_QUERY; + return SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_QUERY; default: return 0; } @@ -3909,17 +3909,11 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) /* FILE_MAP_EXECUTE | FILE_MAP_COPY broken on XP */ if (base != NULL && view[j].access == (FILE_MAP_EXECUTE | FILE_MAP_COPY)) { - todo_wine ok( broken(base != NULL), "%d: MapViewOfFile(%04x/%04x) should fail\n", j, page_prot[i], view[j].access); UnmapViewOfFile( base ); } - else todo_wine_if ((page_prot[i] == PAGE_READONLY && - is_compatible_access( PAGE_EXECUTE_READ, view[j].access )) || - (page_prot[i] == PAGE_READWRITE && - is_compatible_access( PAGE_EXECUTE_READWRITE, view[j].access )) || - (page_prot[i] == PAGE_WRITECOPY && - is_compatible_access( PAGE_EXECUTE_WRITECOPY, view[j].access ))) + else { ok(!base, "%d: MapViewOfFile(%04x/%04x) should fail\n", j, page_prot[i], view[j].access); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 76edd2a..295b5e8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1842,7 +1842,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, TRACE("Trying native dll %s\n", debugstr_w(name)); size.QuadPart = 0; - status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | + SECTION_MAP_READ | SECTION_MAP_EXECUTE, NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, file ); if (status != STATUS_SUCCESS) return status; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index bcd9680..d2cd076 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2750,18 +2750,20 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p switch(protect) { case PAGE_NOACCESS: + case PAGE_READONLY: + case PAGE_WRITECOPY: access = SECTION_MAP_READ; break; case PAGE_READWRITE: - case PAGE_EXECUTE_READWRITE: access = SECTION_MAP_WRITE; break; - case PAGE_READONLY: - case PAGE_WRITECOPY: case PAGE_EXECUTE: case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: - access = SECTION_MAP_READ; + access = SECTION_MAP_READ | SECTION_MAP_EXECUTE; + break; + case PAGE_EXECUTE_READWRITE: + access = SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; break; default: return STATUS_INVALID_PAGE_PROTECTION;

1 0

Hans Leidekker : winhttp: Trace errors from send and recv.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 9b3b5fd0c0459ab91d715dab31c9d270ffb4364a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3b5fd0c0459ab91d715dab3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 12 09:59:04 2017 +0200 winhttp: Trace errors from send and recv. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c9aa6d4..5cce127 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -144,7 +144,7 @@ static int sock_send(int fd, const void *msg, size_t len, int flags) int ret; do { - ret = send(fd, msg, len, flags); + if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %s\n", strerror(errno)); } while(ret == -1 && errno == EINTR); return ret; @@ -155,7 +155,7 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) int ret; do { - ret = recv(fd, msg, len, flags); + if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %s\n", strerror(errno)); } while(ret == -1 && errno == EINTR); return ret; @@ -484,7 +484,6 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl size = sock_recv(conn->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); if(size < 1) { - WARN("recv error\n"); status = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; break; } @@ -620,10 +619,8 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * conn->extra_buf = NULL; }else { buf_len = sock_recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); - if(buf_len < 0) { - WARN("recv failed\n"); + if(buf_len < 0) return FALSE; - } if(!buf_len) { *eof = TRUE;

1 0

Hans Leidekker : winhttp: Implement WINHTTP_OPTION_SECURE_PROTOCOLS.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 2b77b0bb6b220979278bc4153d0fa854f8eeb5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b77b0bb6b220979278bc4153… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 12 09:59:06 2017 +0200 winhttp: Implement WINHTTP_OPTION_SECURE_PROTOCOLS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 19 ++++++++++++++++++- dlls/winhttp/session.c | 11 +++++++++++ dlls/winhttp/tests/winhttp.c | 7 ++++++- dlls/winhttp/winhttp_private.h | 1 + include/winhttp.h | 12 ++++++++---- 5 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4103a84..f3f4cf8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1093,11 +1093,28 @@ static void cache_connection( netconn_t *netconn ) LeaveCriticalSection( &connection_pool_cs ); } +static DWORD map_secure_protocols( DWORD mask ) +{ + DWORD ret = 0; + if (mask & WINHTTP_FLAG_SECURE_PROTOCOL_SSL2) ret |= SP_PROT_SSL2_CLIENT; + if (mask & WINHTTP_FLAG_SECURE_PROTOCOL_SSL3) ret |= SP_PROT_SSL3_CLIENT; + if (mask & WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) ret |= SP_PROT_TLS1_CLIENT; + if (mask & WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1) ret |= SP_PROT_TLS1_1_CLIENT; + if (mask & WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2) ret |= SP_PROT_TLS1_2_CLIENT; + return ret; +} + static BOOL ensure_cred_handle( session_t *session ) { + SCHANNEL_CRED cred; SECURITY_STATUS status; + if (session->cred_handle_initialized) return TRUE; - if ((status = AcquireCredentialsHandleW( NULL, (WCHAR *)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, NULL, + + memset( &cred, 0, sizeof(cred) ); + cred.dwVersion = SCHANNEL_CRED_VERSION; + cred.grbitEnabledProtocols = map_secure_protocols( session->secure_protocols ); + if ((status = AcquireCredentialsHandleW( NULL, (WCHAR *)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, &session->cred_handle, NULL )) != SEC_E_OK) { WARN( "AcquireCredentialsHandleW failed: 0x%08x\n", status ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index a448869..b54e77b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -184,6 +184,17 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe hdr->redirect_policy = policy; return TRUE; } + case WINHTTP_OPTION_SECURE_PROTOCOLS: + { + if (buflen != sizeof(session->secure_protocols)) + { + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + session->secure_protocols = *(DWORD *)buffer; + TRACE("0x%x\n", session->secure_protocols); + return TRUE; + } case WINHTTP_OPTION_DISABLE_FEATURE: set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index c9f5ecd..2babe98 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -974,7 +974,7 @@ static void test_secure_connection(void) { static const char data_start[] = "<!DOCTYPE html PUBLIC"; HINTERNET ses, con, req; - DWORD size, status, policy, bitness, read_size, err, available_size; + DWORD size, status, policy, bitness, read_size, err, available_size, protocols; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -987,6 +987,11 @@ static void test_secure_connection(void) ret = WinHttpSetOption(ses, WINHTTP_OPTION_REDIRECT_POLICY, &policy, sizeof(policy)); ok(ret, "failed to set redirect policy %u\n", GetLastError()); + protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); + err = GetLastError(); + ok(ret || (!ret && err == ERROR_INVALID_PARAMETER) /* < win7 */, "failed to set protocols %u\n", err); + con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index dcbfa84..ee41481 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -122,6 +122,7 @@ typedef struct HANDLE unload_event; CredHandle cred_handle; BOOL cred_handle_initialized; + DWORD secure_protocols; } session_t; typedef struct diff --git a/include/winhttp.h b/include/winhttp.h index 52c60e4..e873e77 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -440,10 +440,14 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE 0x00000040 #define WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR 0x80000000 -#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 0x00000008 -#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 0x00000020 -#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080 -#define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 | WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) +#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 0x00000008 +#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 0x00000020 +#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080 +#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 0x00000200 +#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 0x00000800 +#define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 |\ + WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 |\ + WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) #define WINHTTP_AUTH_SCHEME_BASIC 0x00000001 #define WINHTTP_AUTH_SCHEME_NTLM 0x00000002

1 0

Hans Leidekker : winhttp: Allocate a credential handle for each session.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: d71fcc93e47df51d20970630612bc43841941e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71fcc93e47df51d209706306… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 12 09:59:05 2017 +0200 winhttp: Allocate a credential handle for each session. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 47 +++--------------------------------------- dlls/winhttp/request.c | 19 ++++++++++++++++- dlls/winhttp/session.c | 1 + dlls/winhttp/winhttp_private.h | 4 +++- 4 files changed, 25 insertions(+), 46 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5cce127..d0d02d5 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -254,46 +254,8 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu return err; } -static SecHandle cred_handle; -static BOOL cred_handle_initialized; - -static CRITICAL_SECTION init_sechandle_cs; -static CRITICAL_SECTION_DEBUG init_sechandle_cs_debug = { - 0, 0, &init_sechandle_cs, - { &init_sechandle_cs_debug.ProcessLocksList, - &init_sechandle_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": init_sechandle_cs") } -}; -static CRITICAL_SECTION init_sechandle_cs = { &init_sechandle_cs_debug, -1, 0, 0, 0, 0 }; - -static BOOL ensure_cred_handle(void) -{ - BOOL ret = TRUE; - - EnterCriticalSection(&init_sechandle_cs); - - if(!cred_handle_initialized) { - SECURITY_STATUS res; - - res = AcquireCredentialsHandleW(NULL, (WCHAR*)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, NULL, - NULL, NULL, &cred_handle, NULL); - if(res == SEC_E_OK) { - cred_handle_initialized = TRUE; - }else { - WARN("AcquireCredentialsHandleW failed: %u\n", res); - ret = FALSE; - } - } - - LeaveCriticalSection(&init_sechandle_cs); - return ret; -} - void netconn_unload( void ) { - if(cred_handle_initialized) - FreeCredentialsHandle(&cred_handle); - DeleteCriticalSection(&init_sechandle_cs); #ifndef HAVE_GETADDRINFO DeleteCriticalSection(&cs_gethostbyname); #endif @@ -409,7 +371,7 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags ) +BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle ) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; @@ -425,14 +387,11 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl const DWORD isc_req_flags = ISC_REQ_ALLOCATE_MEMORY|ISC_REQ_USE_SESSION_KEY|ISC_REQ_CONFIDENTIALITY |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; - if(!ensure_cred_handle()) - return FALSE; - read_buf = heap_alloc(read_buf_size); if(!read_buf) return FALSE; - status = InitializeSecurityContextW(&cred_handle, NULL, hostname, isc_req_flags, 0, 0, NULL, 0, + status = InitializeSecurityContextW(cred_handle, NULL, hostname, isc_req_flags, 0, 0, NULL, 0, &ctx, &out_desc, &attrs, NULL); assert(status != SEC_E_OK); @@ -492,7 +451,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl in_bufs[0].cbBuffer += size; in_bufs[0].pvBuffer = read_buf; - status = InitializeSecurityContextW(&cred_handle, &ctx, hostname, isc_req_flags, 0, 0, &in_desc, + status = InitializeSecurityContextW(cred_handle, &ctx, hostname, isc_req_flags, 0, 0, &in_desc, 0, NULL, &out_desc, &attrs, NULL); TRACE("InitializeSecurityContext ret %08x\n", status); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b72d2c1..4103a84 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -35,6 +35,7 @@ #include "initguid.h" #include "httprequest.h" #include "httprequestid.h" +#include "schannel.h" #include "winhttp.h" #include "winhttp_private.h" @@ -1092,6 +1093,20 @@ static void cache_connection( netconn_t *netconn ) LeaveCriticalSection( &connection_pool_cs ); } +static BOOL ensure_cred_handle( session_t *session ) +{ + SECURITY_STATUS status; + if (session->cred_handle_initialized) return TRUE; + if ((status = AcquireCredentialsHandleW( NULL, (WCHAR *)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, NULL, + NULL, NULL, &session->cred_handle, NULL )) != SEC_E_OK) + { + WARN( "AcquireCredentialsHandleW failed: 0x%08x\n", status ); + return FALSE; + } + session->cred_handle_initialized = TRUE; + return TRUE; +} + static BOOL open_connection( request_t *request ) { BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; @@ -1219,7 +1234,9 @@ static BOOL open_connection( request_t *request ) return FALSE; } } - if (!netconn_secure_connect( netconn, connect->hostname, request->security_flags )) + if (!ensure_cred_handle( connect->session ) || + !netconn_secure_connect( netconn, connect->hostname, request->security_flags, + &connect->session->cred_handle )) { heap_free( addressW ); netconn_close( netconn ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 877794a..a448869 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -99,6 +99,7 @@ static void session_destroy( object_header_t *hdr ) TRACE("%p\n", session); if (session->unload_event) SetEvent( session->unload_event ); + if (session->cred_handle_initialized) FreeCredentialsHandle( &session->cred_handle ); LIST_FOR_EACH_SAFE( item, next, &session->cookie_cache ) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index a5cea89..dcbfa84 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -120,6 +120,8 @@ typedef struct LPWSTR proxy_password; struct list cookie_cache; HANDLE unload_event; + CredHandle cred_handle; + BOOL cred_handle_initialized; } session_t; typedef struct @@ -300,7 +302,7 @@ void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle * ) DECLSPEC_HIDDEN; BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; BOOL netconn_is_alive( netconn_t * ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLDocument7:: getElementsByClassName implementation.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 68b8b7b4bacf46a8c652a3084eba323d38c841e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b8b7b4bacf46a8c652a3084… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:15:48 2017 +0200 mshtml: Added IHTMLDocument7::getElementsByClassName implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/elements.js | 26 ++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 413b0bd..0a2d243 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3347,11 +3347,32 @@ static HRESULT WINAPI HTMLDocument7_createAttribute(IHTMLDocument7 *iface, BSTR return IHTMLDocument5_createAttribute(&This->IHTMLDocument5_iface, bstrAttrName, ppAttribute); } -static HRESULT WINAPI HTMLDocument7_getElementByClassName(IHTMLDocument7 *iface, BSTR v, IHTMLElementCollection **pel) +static HRESULT WINAPI HTMLDocument7_getElementsByClassName(IHTMLDocument7 *iface, BSTR v, IHTMLElementCollection **pel) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMNodeList *nslist; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc not supported\n"); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_GetElementsByClassName(This->doc_node->nsdoc, &nsstr, &nslist); + nsAString_Finish(&nsstr); + if(FAILED(nsres)) { + ERR("GetElementByClassName failed: %08x\n", nsres); + return E_FAIL; + } + + + *pel = create_collection_from_nodelist(This->doc_node, nslist); + nsIDOMNodeList_Release(nslist); + return S_OK; } static HRESULT WINAPI HTMLDocument7_createProcessingInstruction(IHTMLDocument7 *iface, BSTR target, @@ -4091,7 +4112,7 @@ static const IHTMLDocument7Vtbl HTMLDocument7Vtbl = { HTMLDocument7_get_characterSet, HTMLDocument7_createElement, HTMLDocument7_createAttribute, - HTMLDocument7_getElementByClassName, + HTMLDocument7_getElementsByClassName, HTMLDocument7_createProcessingInstruction, HTMLDocument7_adoptNode, HTMLDocument7_put_onmssitemodejumplistitemremoved, diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 56c4e2f..f0498d5 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -104,9 +104,35 @@ function test_head() { next_test(); } +function test_getElementsByClassName() { + var elems; + + document.body.innerHTML = '<div class="class1">' + + '<div class="class1"></div>' + + '<a id="class1" class="class2"></a>' + + '</div>' + + '<script class="class1"></script>'; + + elems = document.getElementsByClassName("class1"); + ok(elems.length === 3, "elems.length = " + elems.length); + ok(elems[0].tagName === "DIV", "elems[0].tagName = " + elems[0].tagName); + ok(elems[1].tagName === "DIV", "elems[1].tagName = " + elems[1].tagName); + ok(elems[2].tagName === "SCRIPT", "elems[2].tagName = " + elems[2].tagName); + + elems = document.getElementsByClassName("class2"); + ok(elems.length === 1, "elems.length = " + elems.length); + ok(elems[0].tagName === "A", "elems[0].tagName = " + elems[0].tagName); + + elems = document.getElementsByClassName("classnotfound"); + ok(elems.length == 0, "elems.length = " + elems.length); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, test_ElementTraversal, + test_getElementsByClassName, test_head ];

1 0